From 43b3fb575842165ac87b418318fd0b2196a7eb9a Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 7 Mar 2018 02:59:16 +0000 Subject: [PATCH] Bug 17218: [FOLLOW-UP] Removing pointless code and putting checks in missed places To test: 1) Log in as admin 2) View contents of a public list 3) Click drop-down for 'Add to' - there should be no [New list] option 4) Click on an item in the list 5) Click drop-down for 'Add to' in nav bar, click List 6) There should be no option to add a new list in the pop-up window 7) Do a catalog search that will return multiple results 8) Click drop-down for 'Add to list' - there should be no New list option Sponsored-by: Catalyst IT --- catalogue/search.pl | 1 + .../prog/en/includes/virtualshelves-toolbar.inc | 20 -------------------- .../prog/en/modules/catalogue/results.tt | 11 +++++++---- .../en/modules/virtualshelves/addbybiblionumber.tt | 5 ++++- .../prog/en/modules/virtualshelves/shelves.tt | 4 +++- virtualshelves/addbybiblionumber.pl | 1 + 6 files changed, 16 insertions(+), 26 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 79ba83f..de875fb 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -727,6 +727,7 @@ $template->param( displayFacetCount=> C4::Context->preference('displayFacetCount')||0, scan => $scan, search_error => $error, + loggedinuser => $borrowernumber, ); if ($query_desc || $limit_desc) { 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 e6b6952..1c88804 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -11,26 +11,6 @@ $(document).ready(function(){ [% END %] }); -[% IF op == 'view' %] - function sendList(){ - open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); - } - - $(document).ready(function() { - $("#sendlist").click(function(){ - sendList(); - return false; - }); - $("#deleteshelf").click(function(e){ - if(confirm(_("Are you sure you want to delete this list?"))){ - return true; - } else { - e.preventDefault(); - } - }); - }); -[% END %] - //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 459bc08..58f7af4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -72,6 +72,7 @@ [% END %] [% IF Koha.Preference('virtualshelves') %] + [% UNLESS add_to_some_private_shelves.count == 0 && add_to_some_public_shelves.count == 0 %]
- [% END %] + [% END %][% END %] [% IF ( CAN_user_reserveforothers && DisplayMultiPlaceHold ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt index 2c12401..dfeef92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt @@ -72,10 +72,12 @@ [% END %] +[% UNLESS loggedinuser == 0 %]

... or...

[% END %] -

... or...

[% END %] +[% UNLESS loggedinuser == 0 %] +
Add to a new list:
+[% END %] [% END %] 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 1cc962c..ad69254 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -577,7 +577,9 @@ [% IF add_to_some_private_shelves.count > 10 or add_to_some_public_shelves.count > 10 %] param1 += "