Attachment 55803 Details for Bug 17316 – [PASSED QA] Bug 17316: Do not display the list's name if the user does not have permission - Staff

[patch] [PASSED QA] Bug 17316: Do not display the list's name if the user does not have permission - Staff

PASSED-QA-Bug-17316-Do-not-display-the-lists-name-.patch (text/plain), 2.76 KB, created by Katrin Fischer on 2016-09-25 16:33:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2016-09-25 16:33:23 UTC

Size: 2.76 KB

patch

obsolete

>From 4d0092ed809fb5efc8a46f7551fa4a16ec4fdd3b Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 20 Sep 2016 10:03:42 +0100
>Subject: [PATCH] [PASSED QA] 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 <veron@veron.ch>
>
>Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>
>---
> 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 @@
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group"><a id="newshelf" class="btn btn-small" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=add_form&amp;referer=[% op %]"><i class="fa fa-plus"></i> New list</a></div>
> 
>-    [% IF op == 'view' %]
>+    [% IF shelf AND op == 'view' %]
>         [% IF can_manage_shelf %]
>         <div class="btn-group">
>             <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>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("<a id=\"CheckNone\" href=\"/cgi-bin/koha/shelves.pl\"><i class=\"fa fa-remove\"></i>"+_(" 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.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 17316: 55707 | 55708 | 55709 | 55710 | 55711 | 55712 | 55802 | 55803