Attachment 146401 Details for Bug 32507 – Bug 32507: (follow-up) Change parameter name to avoid collisions

[patch] Bug 32507: (follow-up) Change parameter name to avoid collisions

Bug-32507-follow-up-Change-parameter-name-to-avoid.patch (text/plain), 3.20 KB, created by Owen Leonard on 2023-02-08 16:48:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-02-08 16:48:20 UTC

Size: 3.20 KB

patch

obsolete

>From e253867ce6e9061da903f852c87025e68a50263f Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 5 Jan 2023 18:44:47 +0000
>Subject: [PATCH] Bug 32507: (follow-up) Change parameter name to avoid
> collisions
>
>The variable name "active" is very likely to already be set for other
>reasons, so changing the parameter name to "bc_active" to avoid
>problems.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 8 ++++----
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt   | 6 +++---
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
>index faed2b2e34..758c7ba8d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
>@@ -412,7 +412,7 @@
>             [ WRAPPER breadcrumb_item ]
>                 <a href="/cgi-bin/koha/module/page.pl"> Module page </a>
>             [ END ]
>-            [ WRAPPER breadcrumb_item active = 1 ]
>+            [ WRAPPER breadcrumb_item bc_active = 1 ]
>                 Add form
>             [ END ]
> 
>@@ -420,12 +420,12 @@
>             [ WRAPPER breadcrumb_item ]
>                 <a href="/cgi-bin/koha/module/page.pl"> Module page </a>
>             [ END ]
>-            [ WRAPPER breadcrumb_item active = 1 ]
>+            [ WRAPPER breadcrumb_item bc_active = 1 ]
>                 Confirm deletion
>             [ END ]
> 
>         [ ELSE ]
>-            [ WRAPPER breadcrumb_item active = 1 ]
>+            [ WRAPPER breadcrumb_item bc_active = 1 ]
>                 Module page
>             [ END ]
>         [ END #/IF op = add_form ]
>@@ -448,7 +448,7 @@
> 
> [%# Used to build individual breadcrumb items in the breadcrumb nav %]
> [% BLOCK breadcrumb_item %]
>-    [% IF ( active ) %]
>+    [% IF ( bc_active ) %]
>         <li>
>             <a href="#" aria-current="page">
>                 [% content | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>index b71bcd2f72..98235c8215 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>@@ -33,7 +33,7 @@
>             [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/cities.pl">Cities</a>
>             [% END %]
>-            [% WRAPPER breadcrumb_item active = 1 %]
>+            [% WRAPPER breadcrumb_item bc_active = 1 %]
>                 [% IF city.cityid %]
>                     <span>Modify city</span>
>                 [% ELSE %]
>@@ -45,12 +45,12 @@
>             [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/cities.pl">Cities</a>
>             [% END %]
>-            [% WRAPPER breadcrumb_item active = 1 %]
>+            [% WRAPPER breadcrumb_item bc_active = 1 %]
>                 Confirm deletion of city
>             [% END %]
> 
>         [% ELSE %]
>-            [% WRAPPER breadcrumb_item active = 1 %]
>+            [% WRAPPER breadcrumb_item bc_active = 1 %]
>                 Cities
>             [% END %]
>         [% END #/IF op = add_form %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32507: 144742 | 144754 | 145070 | 145147 | 145148 | 146400 | 146401