From 49fa3c0d08232e6d44f82e6827cedb076bcdbdd7 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 10 Oct 2013 10:46:17 -0400
Subject: [PATCH] Bug 10904: Limit patron update request management by branch

By not limiting the patron modification lists by branch, it can quickly
become overwhelming for a librarian. This patch makes the following
modifications:

* Only superlibrians will see the full list of borrowers with pending
  modifications.
* Adds the patron cardnumber after the patrons name on the modification
  list.
* Adds a link to the patron's record from the modification list.

Test Plan:
1) Apply this patch
2) Set up some pending modifications for two branches
3) Log in to the staff intranet as one of those branches
4) You should note the number of pending modifications counts
   only your logged in branch's patrons
5) Click the link, you should only see your logged in branches
   patrons in the pending modifications list.
6) You should note the cardnumber is displayed next to the patron name
7) You should note the "View record" link below each patron's name

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/members/members-update.tt             | 3 ++-
 mainpage.pl                                               | 8 +++-----
 members/members-update.pl                                 | 7 +++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
index 6337fc39b2..64cffa20ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -77,8 +77,9 @@
                     <div id="pending_updates">
                             [% FOREACH pm IN PendingModifications %]
                                 [% SET borrowernumber = pm.borrowernumber %]
-                                <h3><a href="#panel_modify_[% pm.borrowernumber %]">[% borrowers.$borrowernumber.surname %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname %][% END %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) %])</a></h3>
+                                <h3><a href="#panel_modify_[% pm.borrowernumber %]">[% borrowers.$borrowernumber.surname %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname %][% END %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) %]) ([% borrowers.$borrowernumber.cardnumber %])</a></h3>
                                 <div id="panel_modify_[% pm.borrowernumber %]">
+                                    <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">View record</a>
                                     <div style="background-color:#E6F0F2;padding:.5em;margin:.3em 0;">
                                         <input type="radio" id="approve_modify_[% pm.borrowernumber %]" name="modify_[% pm.borrowernumber %]" value="approve" />
                                         <label for="approve_modify_[% pm.borrowernumber %]">Approve</label>
diff --git a/mainpage.pl b/mainpage.pl
index 1ccffad867..ccea24030f 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -55,11 +55,9 @@ $template->param(
     koha_news_count => $koha_news_count
 );
 
-my $branch =
-  C4::Context->preference("IndependentBranches")
-  && !$flags->{'superlibrarian'}
-  ? C4::Context->userenv()->{'branch'}
-  : undef;
+my $branch = $flags->{'superlibrarian'}
+  ? undef
+  : C4::Context->userenv()->{'branch'};
 
 my $pendingcomments    = numberofreviews(0);
 my $pendingtags        = get_count_by_tag_status(0);
diff --git a/members/members-update.pl b/members/members-update.pl
index 4311d03c4d..a3c1a9d2ee 100755
--- a/members/members-update.pl
+++ b/members/members-update.pl
@@ -42,10 +42,9 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
 );
 
 my $branch =
-  C4::Context->preference("IndependentBranches")
-  && !$flags->{'superlibrarian'}
-  ? C4::Context->userenv()->{'branch'}
-  : undef;
+  $flags->{'superlibrarian'}
+  ? undef
+  : C4::Context->userenv()->{'branch'};
 
 my $pending_modifications =
   Koha::Borrower::Modifications->GetPendingModifications($branch);
-- 
2.39.5