Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 38663: (follow-up) Fix new library creation

Browse source 
We were attempting to use the a library method prior to saving the
library for the first time.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Martin Renvoize 2025-03-04 13:08:09 +00:00 committed by Katrin Fischer
parent d916e71270
commit a70782ae0a
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
admin/branches.pl
View file

@ -51,10 +51,12 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
} }
); );
my $library;
if ($branchcode) { if ($branchcode) {
$library = Koha::Libraries->find($branchcode);
my @additional_fields = Koha::AdditionalFields->search( { tablename => 'branches' } )->as_list; my @additional_fields = Koha::AdditionalFields->search( { tablename => 'branches' } )->as_list;
my @additional_field_values; my @additional_field_values;
@additional_field_values = Koha::Libraries->find($branchcode)->get_additional_field_values_for_template; @additional_field_values = $library ? $library->get_additional_field_values_for_template : ();
$template->param( $template->param(
additional_fields => \@additional_fields, additional_fields => \@additional_fields,
@ -64,11 +66,10 @@ if ($branchcode) {
if ( $op eq 'add_form' ) { if ( $op eq 'add_form' ) {
$template->param( $template->param(
library => Koha::Libraries->find($branchcode), library => $library,
smtp_servers => Koha::SMTP::Servers->search, smtp_servers => Koha::SMTP::Servers->search,
); );
} elsif ( $branchcode && $op eq 'view' ) { } elsif ( $branchcode && $op eq 'view' ) {
my $library = Koha::Libraries->find($branchcode);
$template->param( $template->param(
library => $library, library => $library,
); );
@ -101,7 +102,6 @@ if ( $op eq 'add_form' ) {
my $is_a_modif = $input->param('is_a_modif'); my $is_a_modif = $input->param('is_a_modif');
if ($is_a_modif) { if ($is_a_modif) {
my $library = Koha::Libraries->find($branchcode);
for my $field (@fields) { for my $field (@fields) {
if ( $field =~ /^(pickup_location|public)$/ ) { if ( $field =~ /^(pickup_location|public)$/ ) {
@ -172,7 +172,7 @@ if ( $op eq 'add_form' ) {
}; };
} else { } else {
$branchcode =~ s|\s||g; $branchcode =~ s|\s||g;
my $library = Koha::Library->new( $library = Koha::Library->new(
{ {
branchcode => $branchcode, branchcode => $branchcode,
( (
@ -225,9 +225,8 @@ if ( $op eq 'add_form' ) {
$index++; $index++;
} }
my @additional_fields = my @additional_fields = $library->prepare_cgi_additional_field_values( $input, 'branches' );
Koha::Libraries->find($branchcode)->prepare_cgi_additional_field_values( $input, 'branches' ); $library->set_additional_fields( \@additional_fields );
Koha::Libraries->find($branchcode)->set_additional_fields( \@additional_fields );
push @messages, { type => 'message', code => 'success_on_insert' }; push @messages, { type => 'message', code => 'success_on_insert' };
} }
@ -238,7 +237,6 @@ if ( $op eq 'add_form' ) {
} }
$op = 'list'; $op = 'list';
} elsif ( $op eq 'delete_confirm' ) { } elsif ( $op eq 'delete_confirm' ) {
my $library = Koha::Libraries->find($branchcode);
my $items_count = Koha::Items->search( my $items_count = Koha::Items->search(
{ {
-or => { -or => {
@ -268,7 +266,6 @@ if ( $op eq 'add_form' ) {
); );
} }
} elsif ( $op eq 'cud-delete_confirmed' ) { } elsif ( $op eq 'cud-delete_confirmed' ) {
my $library = Koha::Libraries->find($branchcode);
my $deleted = eval { $library->delete; }; my $deleted = eval { $library->delete; };