|
Lines 51-60
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
Link Here
|
| 51 |
} |
51 |
} |
| 52 |
); |
52 |
); |
| 53 |
|
53 |
|
|
|
54 |
my $library; |
| 54 |
if ($branchcode) { |
55 |
if ($branchcode) { |
|
|
56 |
$library = Koha::Libraries->find($branchcode); |
| 55 |
my @additional_fields = Koha::AdditionalFields->search( { tablename => 'branches' } )->as_list; |
57 |
my @additional_fields = Koha::AdditionalFields->search( { tablename => 'branches' } )->as_list; |
| 56 |
my @additional_field_values; |
58 |
my @additional_field_values; |
| 57 |
@additional_field_values = Koha::Libraries->find($branchcode)->get_additional_field_values_for_template; |
59 |
@additional_field_values = $library ? $library->get_additional_field_values_for_template : (); |
| 58 |
|
60 |
|
| 59 |
$template->param( |
61 |
$template->param( |
| 60 |
additional_fields => \@additional_fields, |
62 |
additional_fields => \@additional_fields, |
|
Lines 64-74
if ($branchcode) {
Link Here
|
| 64 |
|
66 |
|
| 65 |
if ( $op eq 'add_form' ) { |
67 |
if ( $op eq 'add_form' ) { |
| 66 |
$template->param( |
68 |
$template->param( |
| 67 |
library => Koha::Libraries->find($branchcode), |
69 |
library => $library, |
| 68 |
smtp_servers => Koha::SMTP::Servers->search, |
70 |
smtp_servers => Koha::SMTP::Servers->search, |
| 69 |
); |
71 |
); |
| 70 |
} elsif ( $branchcode && $op eq 'view' ) { |
72 |
} elsif ( $branchcode && $op eq 'view' ) { |
| 71 |
my $library = Koha::Libraries->find($branchcode); |
|
|
| 72 |
$template->param( |
73 |
$template->param( |
| 73 |
library => $library, |
74 |
library => $library, |
| 74 |
); |
75 |
); |
|
Lines 101-107
if ( $op eq 'add_form' ) {
Link Here
|
| 101 |
my $is_a_modif = $input->param('is_a_modif'); |
102 |
my $is_a_modif = $input->param('is_a_modif'); |
| 102 |
|
103 |
|
| 103 |
if ($is_a_modif) { |
104 |
if ($is_a_modif) { |
| 104 |
my $library = Koha::Libraries->find($branchcode); |
|
|
| 105 |
for my $field (@fields) { |
105 |
for my $field (@fields) { |
| 106 |
if ( $field =~ /^(pickup_location|public)$/ ) { |
106 |
if ( $field =~ /^(pickup_location|public)$/ ) { |
| 107 |
|
107 |
|
|
Lines 172-178
if ( $op eq 'add_form' ) {
Link Here
|
| 172 |
}; |
172 |
}; |
| 173 |
} else { |
173 |
} else { |
| 174 |
$branchcode =~ s|\s||g; |
174 |
$branchcode =~ s|\s||g; |
| 175 |
my $library = Koha::Library->new( |
175 |
$library = Koha::Library->new( |
| 176 |
{ |
176 |
{ |
| 177 |
branchcode => $branchcode, |
177 |
branchcode => $branchcode, |
| 178 |
( |
178 |
( |
|
Lines 225-233
if ( $op eq 'add_form' ) {
Link Here
|
| 225 |
$index++; |
225 |
$index++; |
| 226 |
} |
226 |
} |
| 227 |
|
227 |
|
| 228 |
my @additional_fields = |
228 |
my @additional_fields = $library->prepare_cgi_additional_field_values( $input, 'branches' ); |
| 229 |
Koha::Libraries->find($branchcode)->prepare_cgi_additional_field_values( $input, 'branches' ); |
229 |
$library->set_additional_fields( \@additional_fields ); |
| 230 |
Koha::Libraries->find($branchcode)->set_additional_fields( \@additional_fields ); |
|
|
| 231 |
|
230 |
|
| 232 |
push @messages, { type => 'message', code => 'success_on_insert' }; |
231 |
push @messages, { type => 'message', code => 'success_on_insert' }; |
| 233 |
} |
232 |
} |
|
Lines 238-244
if ( $op eq 'add_form' ) {
Link Here
|
| 238 |
} |
237 |
} |
| 239 |
$op = 'list'; |
238 |
$op = 'list'; |
| 240 |
} elsif ( $op eq 'delete_confirm' ) { |
239 |
} elsif ( $op eq 'delete_confirm' ) { |
| 241 |
my $library = Koha::Libraries->find($branchcode); |
|
|
| 242 |
my $items_count = Koha::Items->search( |
240 |
my $items_count = Koha::Items->search( |
| 243 |
{ |
241 |
{ |
| 244 |
-or => { |
242 |
-or => { |
|
Lines 268-274
if ( $op eq 'add_form' ) {
Link Here
|
| 268 |
); |
266 |
); |
| 269 |
} |
267 |
} |
| 270 |
} elsif ( $op eq 'cud-delete_confirmed' ) { |
268 |
} elsif ( $op eq 'cud-delete_confirmed' ) { |
| 271 |
my $library = Koha::Libraries->find($branchcode); |
|
|
| 272 |
|
269 |
|
| 273 |
my $deleted = eval { $library->delete; }; |
270 |
my $deleted = eval { $library->delete; }; |
| 274 |
|
271 |
|
| 275 |
- |
|
|