Attachment 127050 Details for Bug 28959 – Bug 28959: (follow-up) Adjust more places in which 'category' was used

[patch] Bug 28959: (follow-up) Adjust more places in which 'category' was used

Bug-28959-follow-up-Adjust-more-places-in-which-ca.patch (text/plain), 9.39 KB, created by Jonathan Druart on 2021-10-28 12:23:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-10-28 12:23:47 UTC

Size: 9.39 KB

patch

obsolete

>From 2e22ebaed831fd7e806bcb1e697f02526e11b9e0 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=UTF-8
>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>
>---
> 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 c7b678919b5..86d72e4720e 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 b426065ed64..78ecd6ba6a8 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 eb35b6f2c50..b9f5e5e2882 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 34d522d4beb..15bd6325a42 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> 
>                         </div> 
>@@ -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 e1fb91bf206..936a178442d 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.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 28959: 124619 | 124620 | 124621 | 124622 | 124623 | 124624 | 124625 | 124663 | 124788 | 124799 | 124800 | 124801 | 124802 | 124803 | 124807 | 124808 | 124809 | 124810 | 124811 | 127046 | 127047 | 127048 | 127049 | 127050 | 127059 | 127060 | 127062 | 127142 | 127206 | 128036