]> git.koha-community.org Git - koha.git/commit
Bug 25440: Fixed list of 'show_rule' forming variables in the template
authorAndrew Nugged <nugged@gmail.com>
Wed, 17 Jun 2020 20:18:01 +0000 (23:18 +0300)
committerLucas Gass <lucas@bywatersolutions.com>
Mon, 13 Jul 2020 17:07:56 +0000 (17:07 +0000)
commit9ec18eedec41ad4e2058fe39e03c2df19a966c54
tree1bca8cae9e0959a0d93ff8966e52c896cc859cb3
parent79b90fff2f1ff5091c5a050d880c36be34a36f2e
Bug 25440: Fixed list of 'show_rule' forming variables in the template

In smart-rules.tt we have `SET show_rule = ...` section which filled
with 'all used in the loop' variables. Because if historical reasons it
seems that there are some missing, few old, and even doubled ones.
This list is fixed now by:

  - variable names 'article_requests' and 'renewalsallowed' repeated
    so duplicates are removed;

  - 'hardduedatebefore' and 'hardduedateexact' not present in the whole
    site code anywhere anymore;
    IMPORTANT NOTE: these 'hardduedatebefore/hardduedateexact' also
                    exists as remnants in .po-translation files, a lot.

  - 'note', 'hardduedatecompare', 'renewalperiod', 'rentaldiscount'
    template variables were missing from this 'show_rule =' checking
    code so they are added.

Order of fields updated to match with above "SET field = ..." pack.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 25440: (QA follow-up) Correction for typo

'engthunit -> lengthunit

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit d11e16aec74ad694bd56ce3810954091b0bf1259)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt