From 35958a8e03b253eae55319d0a760263e249954dd Mon Sep 17 00:00:00 2001
From: John Beppu <john.beppu@liblime.com>
Date: Mon, 22 Dec 2008 11:07:54 -0600
Subject: [PATCH] bug 2874 [2/3]: added awareness of
 circulate/override_renewals subpermission

A few minor whitespace cleanups were thrown in as well.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 circ/circulation.pl                             |  2 +-
 .../prog/en/modules/circ/circulation.tmpl       | 17 +++++++++++------
 .../prog/en/modules/members/moremember.tmpl     |  4 ++++
 members/moremember.pl                           |  4 ++--
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 417cd8f034..9289b05eaa 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -83,7 +83,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
+        flagsrequired   => { circulate => 'circulate_remaining_permissions' },
     }
 );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 5f812b1beb..f5bbb62bca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -412,8 +412,9 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <th>Item Type</th>
         <th>Call no</th>
         <th>Barcode</th>
+        <th>Renewals</th>
         <th>Renew?</th>
-		<th>Check In?</th>
+        <th>Check In?</th>
     </tr>
 <!-- TMPL_IF NAME="todayissues" --></thead>
 	<tbody>
@@ -434,6 +435,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         </td>
         <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
         <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+        <td><!-- TMPL_VAR NAME="renewals" --></td>
         <td>
         <!-- TMPL_IF NAME="can_renew" -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
@@ -493,8 +495,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <!-- /TMPL_LOOP --> <!-- /loop todayissues -->
     <!-- /if todayissues --><!-- /TMPL_IF --> 
 <!-- TMPL_IF NAME="previssues" -->
-<!-- TMPL_IF NAME="todayissues" --><tr><th colspan="7"><a name="previous" id="previous"></a>Previous checkouts</th></tr><!-- TMPL_ELSE -->
-<tr><th class="{sorter: false}" colspan="7"><a name="previous" id="previous"></a>Previous checkouts</th></tr></thead>
+<!-- TMPL_IF NAME="todayissues" --><tr><th colspan="8"><a name="previous" id="previous"></a>Previous checkouts</th></tr><!-- TMPL_ELSE -->
+<tr><th class="{sorter: false}" colspan="8"><a name="previous" id="previous"></a>Previous checkouts</th></tr></thead>
 	<tbody>
 <!-- /TMPL_IF -->
     <!-- TMPL_LOOP NAME="previssues" -->
@@ -515,6 +517,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         </td>
         <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
         <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+        <td><!-- TMPL_VAR NAME="renewals" --></td>
         <td>
         <!-- TMPL_IF NAME="can_renew" -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
@@ -574,18 +577,20 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     </tr>
     <!-- /loop previssues --><!-- /TMPL_LOOP -->
 <!--/if previssues --><!-- /TMPL_IF -->
-	</tbody>
+      </tbody>
     </table>
     <!--TMPL_IF NAME="issuecount"-->
     <fieldset class="action">
-    <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
+    <!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
+        <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
         <label for="override_limit">Override Renewal Limit:</label>
         <input type="checkbox" name="override_limit" id="override_limit" value="1" />
+        <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
     <input type="submit" name="renew_checked" value="Renew Checked Items" />
     <input type="submit" name="renew_all" value="Renew All" />
     </fieldset>
-	<!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 </form>
 <!-- TMPL_ELSE -->
 <p>Patron has nothing checked out.</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index c72637d4b8..2b1d3beebf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -42,6 +42,7 @@ $(document).ready(function() {
 	$("#CheckAllreturns").click(function(){ $(".checkboxed").checkCheckboxes(":input[@name*=barcodes]"); $(".checkboxed").unCheckCheckboxes(":input[@name*=items]"); return false; });
     $("#CheckNoreturns").click(function(){ $(".checkboxed").unCheckCheckboxes(":input[@name*=barcodes]"); return false; });
 
+    <!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
     <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
     $( '#override_limit' ).click( function () {
         if ( this.checked ) {
@@ -50,6 +51,7 @@ $(document).ready(function() {
            $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
         }
     } ).attr( 'checked', false );
+    <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
 	$("td").click(function(e){
 		if(e.target.tagName.toLowerCase() == 'td'){
@@ -467,10 +469,12 @@ if (nodename =="barcodes[]"){
         </tr>
         </table>
         <fieldset class="action">
+        <!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
         <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
         <label for="override_limit">Override Renewal Limit:</label>
         <input type="checkbox" name="override_limit" id="override_limit" value="1" />
         <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
         <input type="submit" name="renew_checked" value="Renew or Return checked items" />
         <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
         <input type="submit" id="return_all" name="return_all" value="Return all" />
diff --git a/members/moremember.pl b/members/moremember.pl
index 151f9c2a30..941272d8bd 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -351,9 +351,9 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
 }
 
 $template->param(
-	detailview => 1,
+    detailview => 1,
     AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
-  DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(), 
+    DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(),
     roaddetails      => $roaddetails,
     borrowernumber   => $borrowernumber,
     categoryname	=> $data->{'description'},
-- 
2.39.5