Bug 24798: smart-rules.tt has erroneous comments
authorOwen Leonard <oleonard@myacpl.org>
Wed, 4 Mar 2020 18:29:24 +0000 (18:29 +0000)
committerHayley Mapley <hayleymapley@catalyst.net.nz>
Tue, 14 Apr 2020 22:00:54 +0000 (10:00 +1200)
This patch corrects a couple of invalid Template Toolkit comments in the
Circulation and Fines rules template.

To test, apply the patch and log into the staff client as an
administrator.

On the Circulation and Fines Rules page "View source" and look for
instances of the text "[#% Default branch %#]" There should be none.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
[EDIT] There is a theoretical difference between [% # and [%#. The latter
marks the whole directive as a comment and not just until EOL.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 1fbd4468642aa09b999b3baf014b6f3a0afd6df8)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit b791fabc939ace33aa915d3ae6e2480ce2901581)

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt

index 915f36e..b612259 100644 (file)
                 <tr>
                     <td>
                         <select name="refund">
-                          [#% Default branch %#]
+                          [%# Default branch %]
                           [% IF ( current_branch == '*' ) %]
                             [% IF ( ( not refundLostItemFeeRule.refund.defined ) || refundLostItemFeeRule.refund ) %]
                             <option value="1" selected="selected">
                                 No
                             </option>
                           [% ELSE %]
-                          [#% Branch-specific %#]
+                          [%# Branch-specific %]
                             [% IF ( not refundLostItemFeeRule ) %]
                                 <option value="*" selected="selected">
                             [% ELSE %]