From e19c25fbad538716cc8e24e03d0aa0d554826cf4 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 26 Nov 2019 12:00:52 +0100
Subject: [PATCH] Bug 18936: fixes from comment #88
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

- holds per day are not transferred in database update (actually not
displayed)
- in note column, I can see link "view notes" even if there is no note
- No automatic renewal after (hard limit) does not respect dateformat
and is shown in iso format

Signed-off-by: Minna Kivinen <minna.kivinen@hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt      | 6 +++---
 1 file changed, 3 insertions(+), 3 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 71638e0306..d2b1a3e0e1 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
@@ -177,7 +177,7 @@
                                       <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype || '*' | html %]&amp;categorycode=[% rule.categorycode || '*' | html %]&amp;branch=[% current_branch | html %]"><i class="fa fa-trash"></i> Delete</a>
                                     </td>
                                     <td>
-                                        [% IF note.defined %]
+                                        [% IF note.defined && note != '' %]
                                             <a name="viewnote" data-toggle="popover" title="Note" data-content="[% note | html %]" data-placement="top" data-trigger="hover">View note</a>
                                         [% ELSE %]<span>&nbsp;</span>[% END %]
                                     </td>
@@ -247,10 +247,10 @@
                                         [% END %]
                                     </td>
                                     <td>[% no_auto_renewal_after | html %]</td>
-                                    <td>[% no_auto_renewal_after_hard_limit | html %]</td>
+                                    <td>[% no_auto_renewal_after_hard_limit | $KohaDates %]</td>
                                     <td>[% reservesallowed | html %]</td>
                                     <td>
-                                        [% IF holds_per_day.defined && holds != '' %]
+                                        [% IF holds_per_day.defined && holds_per_day != '' %]
                                             [% holds_per_day | html %]
                                         [% ELSE %]
                                             <span>Unlimited</span>
-- 
2.39.5