@@ -, +, @@ --- .../prog/en/includes/circ-toolbar.inc | 148 ---------------- .../prog/en/includes/members-toolbar.inc | 184 +++++++++++--------- .../prog/en/modules/circ/circulation.tt | 3 +- .../intranet-tmpl/prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/routing-lists.tt | 2 +- members/moremember.pl | 4 +- members/setstatus.pl | 4 +- 9 files changed, 109 insertions(+), 242 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc @@ -1,148 +0,0 @@ -
- -
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -1,124 +1,136 @@
- -
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1,5 +1,6 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] +[% SET destination = "circ" %] Koha › Circulation [% IF borrowernumber %] › Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 %] @@ -261,7 +262,7 @@ function validate1(date) { [% END %] [% IF ( borrowernumber ) %] -[% INCLUDE 'circ-toolbar.inc' %] +[% INCLUDE 'members-toolbar.inc' %] [% END %] <!-- INITIAL BLOC : PARAMETERS & BORROWER INFO --> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -13,7 +13,7 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b"> - [% INCLUDE 'circ-toolbar.inc' %] + [% INCLUDE 'members-toolbar.inc' %] <h1>Files</h1> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -35,7 +35,7 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b"> -[% INCLUDE 'circ-toolbar.inc' %] +[% INCLUDE 'members-toolbar.inc' %] <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -25,7 +25,7 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b"> -[% INCLUDE 'circ-toolbar.inc' %] +[% INCLUDE 'members-toolbar.inc' %] <h1>Circulation history</h1> [% IF loop_reading %] <form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -12,7 +12,7 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b"> -[% INCLUDE 'circ-toolbar.inc' %] +[% INCLUDE 'members-toolbar.inc' %] <!-- Search Bar --> <p class="tip">Search subscriptions:</p> --- a/members/moremember.pl +++ a/members/moremember.pl @@ -85,7 +85,9 @@ my $quickslip = 0; my $flagsrequired; if ($print eq "page") { $template_name = "members/moremember-print.tmpl"; - $flagsrequired = { borrowers => 1 }; + # circ staff who process checkouts but can't edit + # patrons still need to be able to access print view + $flagsrequired = { circulate => "circulate_remaining_permissions" }; } elsif ($print eq "slip") { $template_name = "members/moremember-receipt.tmpl"; # circ staff who process checkouts but can't edit --- a/members/setstatus.pl +++ a/members/setstatus.pl @@ -64,8 +64,8 @@ if($destination eq "circ"){ } } else { if($dateexpiry){ - print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber&dateexpiry=$dateexpiry"); + print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&dateexpiry=$dateexpiry"); } else { - print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber"); + print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber"); } } --