Attachment 153408 Details for Bug 34269 – Bug 34269: Convert to using codes in select compares

[patch] Bug 34269: Convert to using codes in select compares

Bug-34269-Convert-to-using-codes-in-select-compare.patch (text/plain), 9.97 KB, created by Martin Renvoize (ashimema) on 2023-07-13 16:03:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-07-13 16:03:29 UTC

Size: 9.97 KB

patch

obsolete

>From 2b5ba8f5af8628918ff54a12504503b4f55410f8 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 13 Jul 2023 17:01:07 +0100
>Subject: [PATCH] Bug 34269: Convert to using codes in select compares
>
>This patch updates the logic in smart rules to compare option values to
>codes as apposed to option texts to value descriptions.
>---
> .../prog/en/modules/admin/smart-rules.tt | 38 +++++++++----------
> 1 file changed, 18 insertions(+), 20 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 7d403b1214..a37a41349e 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
>@@ -209,7 +209,7 @@
> [% ELSE %]
> 0
> [% END %]</td>
>- <td>
>+ <td data-code="[% c %]">
> [% IF c == undef %]
> All
> [% ELSE %]
>@@ -221,7 +221,7 @@
> [% ELSE %]
> 0
> [% END %]</td>
>- <td>
>+ <td data-code="[% i %]">
> [% IF i == undef %]
> All
> [% ELSE %]
>@@ -252,7 +252,7 @@
> [% END %]
> </td>
> <td>[% issuelength | html %]</td>
>- <td>
>+ <td data-code="[% daysmode %]">
> [% SWITCH daysmode %]
> [% CASE 'Calendar' %]Skip closed days
> [% CASE 'Datedue' %]Next open day
>@@ -261,7 +261,7 @@
> [% CASE %]Default
> [% END %]
> </td>
>- <td>
>+ <td data-code="[% lengthunit %]">
> [% IF ( lengthunit == 'days' ) %]
> Days
> [% ELSIF ( lengthunit == 'hours') %]
>@@ -270,7 +270,7 @@
> Undefined
> [% END %]
> </td>
>- <td>
>+ <td data-code="[% hardduedatecompare %]">
> [% IF ( hardduedate ) %]
> [% IF ( hardduedatecompare == '-1' ) %]
> before [% hardduedate | $KohaDates %]
>@@ -314,7 +314,7 @@
> [% END %]
> <td>[% renewalperiod | html %]</td>
> <td>[% norenewalbefore | html %]</td>
>- <td>
>+ <td data-code="[%- IF auto_renew -%]yes[%- ELSE -%]no[%- END -%]">
> [% IF auto_renew %]
> Yes
> [% ELSE %]
>@@ -344,7 +344,7 @@
> Unlimited
> [% END %]
> </td>
>- <td>
>+ <td data-code="[% onshelfholds %]">
> [% IF onshelfholds == 1 %]
> Yes
> [% ELSIF onshelfholds == 2 %]
>@@ -353,7 +353,7 @@
> If any unavailable
> [% END %]
> </td>
>- <td>
>+ <td data-code="[% opacitemholds %]">
> [% IF opacitemholds == 'F'%]
> Force
> [% ELSIF opacitemholds == 'Y'%]
>@@ -363,7 +363,7 @@
> [% END %]
> </td>
> [% IF Koha.Preference('ArticleRequests') %]
>- <td>
>+ <td data-code="[% article_requests %]">
> [% IF article_requests == 'no' %]
> No
> [% ELSIF article_requests == 'yes' %]
>@@ -379,7 +379,7 @@
> [% IF Koha.Preference('UseRecalls') %]
> <td>[% recalls_allowed | html %]</td>
> <td>[% recalls_per_record | html %]</td>
>- <td>
>+ <td data-code="[% on_shelf_recalls %]">
> [% IF on_shelf_recalls == 'all' %]
> If all unavailable
> [% ELSE %]
>@@ -1461,8 +1461,9 @@
> $('#default-circulation-rules td').removeClass('highlighted-row');
> $(this).parent().parent().find("td").each(function (i) {
> $(this).addClass('highlighted-row');
>- itm = $(this).text();
>- itm = itm.replace(/^\s*|\s*$/g,'');
>+ itm_code = $(this).data('code');
>+ itm_text = $(this).text();
>+ itm_text = itm_text.replace(/^\s*|\s*$/g,'');
> var current_column = $("#edit_row td:eq("+i+")");
> if ( i == 3 ) {
> // specific processing for the Note column
>@@ -1475,7 +1476,7 @@
> if (typeof select_value === 'undefined'){
> select_value = '-1';
> }else {
>- input_value = itm.split(' ')[1];
>+ input_value = itm_text.split(' ')[1];
> }
> $(current_column).find("input[type='text']").val(input_value);
> $(current_column).find("select").val(select_value);
>@@ -1485,14 +1486,11 @@
> $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
> $('#overduefinescap').prop('disabled', cap_fine_to_replacement_price.is(':checked') );
> } else {
>- $(current_column).find("input[type='text']").val(itm);
>+ $(current_column).find("input[type='text']").val(itm_text);
> // select the corresponding option
> $(current_column).find("select option").each(function(){
>- opt = $(this).text().toLowerCase();
>- opt = opt.replace(/ $\w*?$$/,""); //If option is a parent, compare without (All) or the equivalent in other languages
>- itm = itm.replace(/.*->(.*)/,"$1"); //If item type is part of a group we need to clear the parent description
>- opt = opt.replace(/^\s*|\s*$/g,'');
>- if ( opt == itm.toLowerCase() ) {
>+ opt = $(this).attr('value');
>+ if ( opt == itm_code ) {
> $(this).attr('selected', 'selected');
> }
> });
>@@ -1515,7 +1513,7 @@
> // - "Holds per record (count)"
> // The value is "Unlimited" (or an equivalent translated string)
> // an it should be set to an empty string
>- if( !((parseFloat(itm) == parseInt(itm)) && !isNaN(itm)) ) {
>+ if( !((parseFloat(itm_text) == parseInt(itm_text)) && !isNaN(itm_text)) ) {
> $(current_column).find("input[type='text']").val("");
> }
> }
>-- 
>2.41.0

Actions: View | Diff | Splinter Review

Attachments on bug 34269: 153407 | 153408 | 153456 | 153457 | 153985 | 153986 | 153987 | 153988 | 154074 | 154075 | 154255 | 154256