From 7b683cf583766e41c8241cc3e2ceaf9a3b0ed295 Mon Sep 17 00:00:00 2001 From: John Beppu 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 --- 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 198ab2d52b..14f94f1d6e 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -86,7 +86,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 a41e0f2c18..6bc70b2b33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -432,8 +432,9 @@ No patron matched Item Type Call no Barcode + Renewals Renew? - Check In? + Check In? @@ -454,6 +455,7 @@ No patron matched &itemnumber=#item"> + " checked="checked" style="display: none;" /> @@ -492,8 +494,8 @@ No patron matched -Previous checkouts -Previous checkouts +Previous checkouts +Previous checkouts @@ -514,6 +516,7 @@ No patron matched &itemnumber=#item"> + " checked="checked" style="display: none;" /> @@ -552,18 +555,20 @@ No patron matched - +
- + + +
- +

Patron has nothing checked out.

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 53e3d584fc..cf85083221 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; }); + $( '#override_limit' ).click( function () { if ( this.checked ) { @@ -50,6 +51,7 @@ $(document).ready(function() { $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show(); } } ).attr( 'checked', false ); + $("td").click(function(e){ if(e.target.tagName.toLowerCase() == 'td'){ @@ -466,10 +468,12 @@ if (nodename =="barcodes[]"){
+ + diff --git a/members/moremember.pl b/members/moremember.pl index 03d332365e..5688ae9ade 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -350,9 +350,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