Attachment 37057 Details for Bug 11625 – Bug 11625 [QA Followup 2] - Don't default to branch specific rules if only one branch exists

[patch] Bug 11625 [QA Followup 2] - Don't default to branch specific rules if only one branch exists

Bug-11625-QA-Followup-2---Dont-default-to-branch-s.patch (text/plain), 1.34 KB, created by Kyle M Hall (khall) on 2015-03-20 16:09:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-03-20 16:09:05 UTC

Size: 1.34 KB

patch

obsolete

>From 767a6f799b99ed8799a0834067573db080789d83 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 5 Mar 2014 07:49:05 -0500
>Subject: [PATCH] Bug 11625 [QA Followup 2] - Don't default to branch specific rules if only one branch exists
>
>---
> admin/smart-rules.pl |    2 +-
> tools/letter.pl      |    1 +
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
>index 02f4b66..b0234d5 100755
>--- a/admin/smart-rules.pl
>+++ b/admin/smart-rules.pl
>@@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie)
>                             });
> 
> my $type=$input->param('type');
>-my $branch = $input->param('branch') || C4::Branch::mybranch();
>+my $branch = $input->param('branch') || GetBranchesCount() == 1 ? undef : C4::Branch::mybranch();
> $branch = '*' if $branch eq 'NO_LIBRARY_SET';
> my $op = $input->param('op') || q{};
> 
>diff --git a/tools/letter.pl b/tools/letter.pl
>index 7ad55cf..86487ba 100755
>--- a/tools/letter.pl
>+++ b/tools/letter.pl
>@@ -83,6 +83,7 @@ our $branchcode =
>     $input->param('branchcode') eq '*' ? undef
>   : $input->param('branchcode') ? $input->param('branchcode')
>   : $op                         ? $input->param('branchcode')
>+  : GetBranchesCount() == 1     ? undef
>   :                               C4::Branch::mybranch();
> 
> my $dbh = C4::Context->dbh;
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 11625: 24845 | 24861 | 24941 | 24984 | 24985 | 25839 | 25840 | 35460 | 35461 | 35462 | 35463 | 37055 | 37056 | 37057 | 37058 | 38093 | 38094 | 38095 | 38096 | 38276 | 38277 | 38278 | 38422 | 38424 | 41795 | 41796 | 41797 | 43496 | 43497 | 43498