Bugzilla – Attachment 46685 Details for
Bug 15568
Circ rules are not displayed anymore
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15568: Fix display default circ rules
Bug-15568-Fix-display-default-circ-rules.patch (text/plain), 1.61 KB, created by
Jonathan Druart
on 2016-01-15 09:49:59 UTC
(
hide
)
Description:
Bug 15568: Fix display default circ rules
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-01-15 09:49:59 UTC
Size:
1.61 KB
patch
obsolete
>From c6ec7c17d6b3947fae9dd2cc60311213b485b6be Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 13 Jan 2016 16:13:36 +0000 >Subject: [PATCH] Bug 15568: Fix display default circ rules > >To reproduce: >Go on the admin circ rules page (admin/smart-rules.pl), switch the >dropdown list from specific to "all libraries". >The rules are not displayed anymore. > >Test plan: >Apply this patch and confirm that the rules are now displayed correctly. >Make sure the enh introduced by bug 11625 is not broken. > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > admin/smart-rules.pl | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > >diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl >index ff8c67a..e120bd8 100755 >--- a/admin/smart-rules.pl >+++ b/admin/smart-rules.pl >@@ -48,12 +48,14 @@ my ($template, $loggedinuser, $cookie) > > my $type=$input->param('type'); > >-my $branch; >-if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) { >- $branch = $input->param('branch') || Koha::Libraries->search->count() == 1 ? undef : C4::Branch::mybranch(); >-} >-else { >- $branch = $input->param('branch') || ( C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*' ); >+my $branch = $input->param('branch'); >+unless ( $branch ) { >+ if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) { >+ $branch = Koha::Libraries->search->count() == 1 ? undef : C4::Branch::mybranch(); >+ } >+ else { >+ $branch = C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*'; >+ } > } > $branch = '*' if $branch eq 'NO_LIBRARY_SET'; > >-- >2.1.0
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 15568
:
46593
|
46661
|
46662
|
46664
|
46665
|
46679
|
46685
|
46697
|
46827