From 35d03d6cf630575b402fea2f6b18c5eb7aebae9c Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Fri, 10 Sep 2021 20:50:31 -1000
Subject: [PATCH] Bug 28959: (follow-up) Adjust more places in which 'category'
 was used
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Some links still had category.

I propose we use explicit public=1 and public=0 when links to public/private are side by side.
Otherwise whe just use /cgi-bin/koha/opac-shelves.pl?op=list using default value 0.

Signed-off-by: David Nind <david@davidnind.com>
JK: Adjust commit title
Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc    | 8 ++++----
 koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc    | 2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt  | 4 ++--
 .../opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt     | 6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt  | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index c7b678919b..86d72e4720 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -41,7 +41,7 @@
                         </a>
                         <div aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
                             [% IF some_public_shelves.count %]
-                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a>
+                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem"><strong>Public lists</strong></a>
                                 [% SET number_of_public_shelves = 0 %]
                                 [% FOREACH s IN some_public_shelves %]
                                     <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a>
@@ -49,14 +49,14 @@
                                     [% IF number_of_public_shelves >= 10 %][% LAST %][% END %]
                                 [% END %]
                                 [% IF some_public_shelves > 10 %]
-                                    <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem">View all</a>
+                                    <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem">View all</a>
                                 [% END %]
                             [% END %]
                             [% IF some_public_shelves.count > 0 %]
                                 <div class="dropdown-divider"></div>
                             [% END %]
                             [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1" tabindex="-1" role="menuitem"><strong>Your lists</strong></a>
+                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem"><strong>Your lists</strong></a>
                                 [% IF loggedinusername %]
                                     [% IF some_private_shelves.count %]
                                         [% SET number_of_private_shelves = 0 %]
@@ -66,7 +66,7 @@
                                             [% IF number_of_private_shelves >= 10 %][% LAST %][% END %]
                                         [% END %]
                                         [% IF some_private_shelves > 10 %]
-                                            <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1" tabindex="-1" role="menuitem">View all</a>
+                                            <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem">View all</a>
                                         [% END %]
                                     [% ELSE %]
                                         <a class="dropdown-item disabled" href="#" tabindex="-1" role="menuitem">No private lists</a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
index b426065ed6..78ecd6ba6a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -109,7 +109,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">your lists</a></li>
+                <a href="/cgi-bin/koha/opac-shelves.pl?op=list">your lists</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'RoutingSerials' ) && logged_in_user && logged_in_user.get_routing_lists.count %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
index eb35b6f2c5..b9f5e5e288 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
@@ -17,9 +17,9 @@
                     [% END %]
                     <li class="breadcrumb-item">
                         [% IF shelf.category == 1 %]
-                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">Your lists</a>
+                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0">Your lists</a>
                         [% ELSE %]
-                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2">Public lists</a>
+                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1">Public lists</a>
                         [% END %]
                     </li>
                     <li class="breadcrumb-item active">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
index 34d522d4be..15bd6325a4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
@@ -71,7 +71,7 @@
                         [% IF errcode==8 %]
                             <div class="alert alert-warning">As owner of a list you cannot accept an invitation for sharing it.</div>
                         [% END %]
-                        <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">Return to your lists</a></p>
+                        <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list">Return to your lists</a></p>
 
                     [% ELSIF op=='invite' %]
                         <div id="invite">
@@ -92,7 +92,7 @@
                                 </fieldset>
                                 <fieldset class="action">
                                     <input type="submit" value="Send" class="btn btn-primary" />
-                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1" class="cancel">Cancel</a>
+                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list" class="cancel">Cancel</a>
                                 </fieldset>
                             </form> <!-- /#share_list -->
                         </div> <!-- /#invite -->
@@ -108,7 +108,7 @@
                             [% IF approvedaddress %]
                                 <p>You will receive an email notification if someone accepts your share before it expires.</p>
                             [% END %]
-                            <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">Return to your lists</a></p>
+                            <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list">Return to your lists</a></p>
                         </div>
 
                     [% ELSIF op=='accept' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index e1fb91bf20..936a178442 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -630,7 +630,7 @@
                                 [% IF referer == 'view' %]
                                     <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
                                 [% ELSE %]
-                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" class="cancel">Cancel</a>
+                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list" class="cancel">Cancel</a>
                                 [% END %]
                             </fieldset>
                         </form>
@@ -1047,7 +1047,7 @@ function AdjustRemark() {
         [% ELSE %]
             $("#anyone_remark").hide();
         [% END %]
-    } else { // category==2
+    } else { // public==1
         $("#anyone_remark").hide();
     }
 }
-- 
2.39.5