From ae48067fedfad532801a910881ee5cdcf9efbada Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Tue, 18 Sep 2012 10:27:39 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 8781: hiding of transfer page when it's useless The transfer page is only useful when the system preference "IndependantBranches" is Off of when the user is a superlibrarian. Otherwise it can be hidden. Signed-off-by: Melia Meggs Signed-off-by: Katrin Fischer All tests and perlcritic pass. TEST PLAN : It's about testing the display of the "Transfer" link on "circulation-home.pl". The link needs to appear if IndependantBranches is off or if the user is a superlibrarian. 1) IndependantBranches = Off, user is superlibrarian : link appears 2) IndependantBranches = Off, user is not superlibrarian : link appears 3) IndependantBranches = On, user is superlibrarian : link appears 4) IndependantBranches = On, user is not superlibrarian : link does not appear --- circ/circulation-home.pl | 5 ++++- .../prog/en/modules/circ/circulation-home.tt | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/circ/circulation-home.pl b/circ/circulation-home.pl index 842f8d9..5eee81b 100755 --- a/circ/circulation-home.pl +++ b/circ/circulation-home.pl @@ -25,7 +25,7 @@ use C4::Context; use C4::Koha; my $query = new CGI; -my ($template, $loggedinuser, $cookie) +my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user({template_name => "circ/circulation-home.tmpl", query => $query, type => "intranet", @@ -37,5 +37,8 @@ my ($template, $loggedinuser, $cookie) my $fa = getframeworkinfo('FA'); $template->param( fast_cataloging => 1 ) if (defined $fa); +# Checking if the transfer page needs to be displayed +$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependantBranches") == 0) ); + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index 8b4ad57..aa1b700 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -19,7 +19,9 @@
  • Check out
  • Check in
  • + [% IF ( display_transfer ) %]
  • Transfer
  • + [% END %] [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependantBranches ) %][% ELSE %]
  • Set library
  • [% END %][% END %] [% IF ( fast_cataloging ) %] [% IF ( CAN_user_editcatalogue_fast_cataloging ) %] -- 1.7.9.5