Attachment 36961 Details for Bug 10904 – Bug 10904 [QA Followup] - Use branch limit if either IndependentBranches or IndependentBranchesPatronModifications is enabled

[patch] Bug 10904 [QA Followup] - Use branch limit if either IndependentBranches or IndependentBranchesPatronModifications is enabled

Bug-10904-QA-Followup---Use-branch-limit-if-either.patch (text/plain), 2.01 KB, created by Kyle M Hall (khall) on 2015-03-17 17:32:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-03-17 17:32:41 UTC

Size: 2.01 KB

patch

obsolete

>From f929d5c94fd6a8366980768dd5f0c1d3b4f83f18 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 17 Apr 2014 10:18:26 -0400
>Subject: [PATCH] Bug 10904 [QA Followup] - Use branch limit if either IndependentBranches or IndependentBranchesPatronModifications is enabled
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Passes all tests and QA script.
>
>Behaviour now is:
>IndependentBranches = Prevent
>or
>IndependentBranches = Don't prevent,
>IndependentBranchesPatronModifications = Prevent:
>You will always only see the modification requests of your branch's patrons.
>
>IndependentBrnaches = Don't prevent,
>IndependentBranchesPatronModifications = Don't prevent
>All modification requests are shown.
>
>Link to patron record works and cardnumber is shown.
>
>IndependentBranches = OFF - use the new preference.
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>---
> mainpage.pl               |    3 ++-
> members/members-update.pl |    3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/mainpage.pl b/mainpage.pl
>index 3a49df3..5150c10 100755
>--- a/mainpage.pl
>+++ b/mainpage.pl
>@@ -55,7 +55,8 @@ $template->param(
> );
> 
> my $branch =
>-  C4::Context->preference("IndependentBranchesPatronModifications")
>+  (      C4::Context->preference("IndependentBranchesPatronModifications")
>+      || C4::Context->preference("IndependentBranches") )
>   && !$flags->{'superlibrarian'}
>   ? C4::Context->userenv()->{'branch'}
>   : undef;
>diff --git a/members/members-update.pl b/members/members-update.pl
>index ead81e8..76db979 100755
>--- a/members/members-update.pl
>+++ b/members/members-update.pl
>@@ -42,7 +42,8 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
> );
> 
> my $branch =
>-  C4::Context->preference("IndependentBranchesPatronModifications")
>+  (      C4::Context->preference("IndependentBranchesPatronModifications")
>+      || C4::Context->preference("IndependentBranches") )
>   && !$flags->{'superlibrarian'}
>   ? C4::Context->userenv()->{'branch'}
>   : undef;
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 10904: 21950 | 22494 | 23103 | 23104 | 25467 | 25468 | 27253 | 27254 | 27255 | 27256 | 36959 | 36960 | 36961 | 42599 | 42600 | 42601