From 6f0f5889dae45e97652fe121713925173b0edcfa Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 20 Sep 2016 10:03:42 +0100 Subject: [PATCH] Bug 17316: Do not display the list's name if the user does not have permission - Staff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same as previous patch but for the staff interface Signed-off-by: Marc Véron --- koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 2 +- virtualshelves/shelves.pl | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index be58db0..8d7a482 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -29,7 +29,7 @@
New list
- [% IF op == 'view' %] + [% IF shelf AND op == 'view' %] [% IF can_manage_shelf %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 4982909..62b17a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -113,7 +113,7 @@ $(document).ready(function(){ }); [% END %] -[% IF op == 'view' %] +[% IF shelf AND op == 'view' %] $(document).ready(function(){ [% IF ( itemsloop ) %]$('#searchheader').fixFloat();[% END %] $("span.clearall").html(""+_(" Clear all")+"<\/a>"); diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index 100af44..11a90ae 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -297,6 +297,7 @@ if ( $op eq 'view' ) { } } else { push @messages, { type => 'error', code => 'unauthorized_on_view' }; + undef $shelf; } } else { push @messages, { type => 'error', code => 'does_not_exist' }; -- 2.1.4