Attachment 168649 Details for Bug 37290 – Bug 37290: Fix data-branch param

[patch] Bug 37290: Fix data-branch param

Bug-37290-Fix-data-branch-param.patch (text/plain), 7.47 KB, created by Pedro Amorim on 2024-07-09 13:42:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro Amorim

Created: 2024-07-09 13:42:13 UTC

Size: 7.47 KB

patch

obsolete

>From d5c469b2ed5b7393cad4e8ad74da7dea26012eda Mon Sep 17 00:00:00 2001
>From: Janusz Kaczmarek <januszop@gmail.com>
>Date: Tue, 9 Jul 2024 13:37:50 +0000
>Subject: [PATCH] Bug 37290: Fix data-branch param
>
>1) Add circulation rules for a specific library
>2) Attempt to remove one of those library specific rules -> get redirected to 'All'
>3) Notice the rule for that specific branch is still there
>
>Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>---
> .../prog/en/modules/admin/smart-rules.tt | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>index d786284c3e..c4943b3407 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>@@ -235,7 +235,7 @@
> </td>
> <td class="actions">
> <a href="#" class="editrule btn btn-default btn-xs"> Edit</a>
>- <a href="#" class="delete btn btn-default btn-xs" data-itemtype="[% i || '*' | html %]" data-categorycode="[% c || '*' | html %]" data-branch"[% current_branch | html %]"> Delete</a>
>+ <a href="#" class="delete btn btn-default btn-xs" data-itemtype="[% i || '*' | html %]" data-categorycode="[% c || '*' | html %]" data-branch="[% current_branch | html %]"> Delete</a>
> </td>
> <td>
> [% IF note.defined && note != '' %]
>@@ -402,7 +402,7 @@
> [% END %]
> <td class="actions">
> <a href="#" class="editrule btn btn-default btn-xs"> Edit</a>
>- <a href="#" class="delete btn btn-default btn-xs" data-itemtype="[% i || '*' | html %]" data-categorycode="[% c || '*' | html %]" data-branch"[% current_branch | html %]"> Delete</a>
>+ <a href="#" class="delete btn btn-default btn-xs" data-itemtype="[% i || '*' | html %]" data-categorycode="[% c || '*' | html %]" data-branch="[% current_branch | html %]"> Delete</a>
> </td>
> </tr>
> [% END %]
>@@ -793,7 +793,7 @@
> <td class="actions">
> <button type="submit" class="btn btn-default btn-xs"> Save</button>
> [% IF ( default_checkout_hold_and_return_policy ) %]
>- <a href="#" class="delete-branch-cat btn btn-default btn-xs" data-categorycode="[% c || '*' | html %]" data-branch"[% current_branch | html %]"> Unset</a>
>+ <a href="#" class="delete-branch-cat btn btn-default btn-xs" data-categorycode="[% c || '*' | html %]" data-branch="[% current_branch | html %]"> Unset</a>
> [% END %]
> </td>
> </tr>
>@@ -861,7 +861,7 @@
> </td>
> 
> <td class="actions">
>- <a href="#" class="delete-branch-cat btn btn-default btn-xs" data-categorycode="[% c | html %]" data-branch"[% current_branch | html %]"> Delete</a>
>+ <a href="#" class="delete-branch-cat btn btn-default btn-xs" data-categorycode="[% c | html %]" data-branch="[% current_branch | html %]"> Delete</a>
> </td>
> </tr>
> [% END %]
>@@ -930,7 +930,7 @@
> [% END %]
> </td>
> <td class="actions">
>- <a href="#" class="del-waiting-hold-cancellation btn btn-default btn-xs" data-categorycode="[% c || '*' | html %]" data-itemtype="[% i|| '*' | html %]" data-branch"[% current_branch | html %]"> Delete</a>
>+ <a href="#" class="del-waiting-hold-cancellation btn btn-default btn-xs" data-categorycode="[% c || '*' | html %]" data-itemtype="[% i|| '*' | html %]" data-branch="[% current_branch | html %]"> Delete</a>
> </td>
> </tr>
> [% END %]
>@@ -1002,7 +1002,7 @@
> </td>
> 
> <td class="actions">
>- <a href="#" class="del-open-article-requests-limit btn btn-default btn-xs" data-categorycode="[% c | html %]" data-branch"[% current_branch | html %]"> Delete</a>
>+ <a href="#" class="del-open-article-requests-limit btn btn-default btn-xs" data-categorycode="[% c | html %]" data-branch="[% current_branch | html %]"> Delete</a>
> </td>
> </tr>
> [% END %]
>@@ -1060,7 +1060,7 @@
> [% END %]
> </td>
> <td class="actions">
>- <a href="#" class="del-article-request-fee btn btn-default btn-xs" data-categorycode="[% c | html %]" data-branch"[% current_branch | html %]"> Delete</a>
>+ <a href="#" class="del-article-request-fee btn btn-default btn-xs" data-categorycode="[% c | html %]" data-branch="[% current_branch | html %]"> Delete</a>
> </td>
> </tr>
> [% END %]
>@@ -1352,7 +1352,7 @@
> [% END %]
> </td>
> <td class="actions">
>- <a href="#" class="delete-branch-item btn btn-default btn-xs" data-itemtype="[% i.itemtype | html %]" data-branch"[% current_branch | html %]"> Delete</a>
>+ <a href="#" class="delete-branch-item btn btn-default btn-xs" data-itemtype="[% i.itemtype | html %]" data-branch="[% current_branch | html %]"> Delete</a>
> </td>
> </tr>
> [% END %]
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 37290: 168649 | 168689