Attachment 46661 Details for Bug 15568 – Bug 15568: Fix display default circ rules

[patch] Bug 15568: Fix display default circ rules

Bug-15568-Fix-display-default-circ-rules.patch (text/plain), 1.66 KB, created by Nick Clemens (kidclamp) on 2016-01-14 17:14:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2016-01-14 17:14:00 UTC

Size: 1.66 KB

patch

obsolete

>From d58287c3f46417d38afa9d93c49b1ed44f6c66ed 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.
>
>This patch also replaces a call to the removed method
>C4::Branches::GetBranchesCoutn with a call to
>Koha::Libraries->search-count
>---
> 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 9c903da..c92473c 100755
>--- a/admin/smart-rules.pl
>+++ b/admin/smart-rules.pl
>@@ -47,12 +47,14 @@ my ($template, $loggedinuser, $cookie)
> 
> my $type=$input->param('type');
> 
>-my $branch;
>-if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) {
>-    $branch = $input->param('branch') || GetBranchesCount() == 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 = GetBranchesCount() == 1 ? undef : C4::Branch::mybranch();
>+    }
>+    else {
>+        $branch = C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*';
>+    }
> }
> $branch = '*' if $branch eq 'NO_LIBRARY_SET';
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15568: 46593 | 46661 | 46662 | 46664 | 46665 | 46679 | 46685 | 46697 | 46827