Bugzilla – Attachment 178914 Details for
Bug 38663
Add additional fields to libraries
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38663: (follow-up) Fix new library creation
Bug-38663-follow-up-Fix-new-library-creation.patch (text/plain), 3.21 KB, created by
Martin Renvoize (ashimema)
on 2025-03-04 13:09:00 UTC
(
hide
)
Description:
Bug 38663: (follow-up) Fix new library creation
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2025-03-04 13:09:00 UTC
Size:
3.21 KB
patch
obsolete
>From cdf47bc5ea1f7976509a56bb29db5c44bab0e47b Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 4 Mar 2025 13:08:09 +0000 >Subject: [PATCH] Bug 38663: (follow-up) Fix new library creation > >We were attempting to use the a library method prior to saving the >library for the first time. >--- > admin/branches.pl | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > >diff --git a/admin/branches.pl b/admin/branches.pl >index e6403c92d6d..b6d55ea9ee1 100755 >--- a/admin/branches.pl >+++ b/admin/branches.pl >@@ -51,10 +51,12 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > } > ); > >+my $library; > if ($branchcode) { >+ $library = Koha::Libraries->find($branchcode); > my @additional_fields = Koha::AdditionalFields->search( { tablename => 'branches' } )->as_list; > 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( > additional_fields => \@additional_fields, >@@ -64,11 +66,10 @@ if ($branchcode) { > > if ( $op eq 'add_form' ) { > $template->param( >- library => Koha::Libraries->find($branchcode), >+ library => $library, > smtp_servers => Koha::SMTP::Servers->search, > ); > } elsif ( $branchcode && $op eq 'view' ) { >- my $library = Koha::Libraries->find($branchcode); > $template->param( > library => $library, > ); >@@ -101,7 +102,6 @@ if ( $op eq 'add_form' ) { > my $is_a_modif = $input->param('is_a_modif'); > > if ($is_a_modif) { >- my $library = Koha::Libraries->find($branchcode); > for my $field (@fields) { > if ( $field =~ /^(pickup_location|public)$/ ) { > >@@ -172,7 +172,7 @@ if ( $op eq 'add_form' ) { > }; > } else { > $branchcode =~ s|\s||g; >- my $library = Koha::Library->new( >+ $library = Koha::Library->new( > { > branchcode => $branchcode, > ( >@@ -225,9 +225,8 @@ if ( $op eq 'add_form' ) { > $index++; > } > >- my @additional_fields = >- Koha::Libraries->find($branchcode)->prepare_cgi_additional_field_values( $input, 'branches' ); >- Koha::Libraries->find($branchcode)->set_additional_fields( \@additional_fields ); >+ my @additional_fields = $library->prepare_cgi_additional_field_values( $input, 'branches' ); >+ $library->set_additional_fields( \@additional_fields ); > > push @messages, { type => 'message', code => 'success_on_insert' }; > } >@@ -238,7 +237,6 @@ if ( $op eq 'add_form' ) { > } > $op = 'list'; > } elsif ( $op eq 'delete_confirm' ) { >- my $library = Koha::Libraries->find($branchcode); > my $items_count = Koha::Items->search( > { > -or => { >@@ -268,7 +266,6 @@ if ( $op eq 'add_form' ) { > ); > } > } elsif ( $op eq 'cud-delete_confirmed' ) { >- my $library = Koha::Libraries->find($branchcode); > > my $deleted = eval { $library->delete; }; > >-- >2.48.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38663
:
175355
|
175356
|
175357
|
175358
|
175359
|
175370
|
175757
|
175758
|
175759
|
175760
|
175761
|
175762
|
176214
|
176215
|
176216
|
176217
|
176218
|
176219
|
176220
|
176221
|
176222
|
176223
|
176224
|
176225
|
176296
|
176781
|
176782
|
176783
|
176784
|
176785
|
176786
|
176787
|
176788
|
176797
|
176799
|
176800
|
176801
|
176802
|
176803
|
176804
|
176805
|
178843
|
178844
|
178845
|
178846
|
178847
|
178848
|
178849
|
178850
| 178914 |
179455
|
181910