Bug 11486: Don't display the number of remaining renewals if == 0

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 8a5439b..5a6a82d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -766,7 +766,7 @@ No patron matched <span class="ex">[% message %]</span>
         [% ELSE %]
             <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
         [% END %]
-            [% IF ( todayissue.renewsallowed ) %]
+            [% IF todayissue.renewsallowed && todayissue.renewsleft %]
                 <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
             [% END %]
         [% ELSE %]
@@ -778,7 +778,7 @@ No patron matched <span class="ex">[% message %]</span>
                     <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
                 [% END %]
                 </span>
-                [% IF ( todayissue.renewsallowed ) %]
+                [% IF todayissue.renewsallowed && todayissue.renewsleft %]
                     <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
                 [% END %]
                 <span class="renewals-disabled">
@@ -861,7 +861,7 @@ No patron matched <span class="ex">[% message %]</span>
         [% ELSE %]
             <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
         [% END %]
-            [% IF ( previssue.renewsallowed ) %]
+            [% IF previssue.renewsallowed && previssue.renewsleft %]
                 <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
             [% END %]
         [% ELSE %]
@@ -873,7 +873,7 @@ No patron matched <span class="ex">[% message %]</span>
                     <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
                 [% END %]
                 </span>
-                [% IF ( previssue.renewsallowed ) %]
+                [% IF previssue.renewsallowed && previssue.renewsleft %]
                     <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
                 [% END %]
                 <span class="renewals-disabled">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 961436c..79d319e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -500,7 +500,7 @@ function validate1(date) {
                         <input type="checkbox" name="items[]" value="[% issueloo.itemnumber %]" />
                     [% END %]
                     </span>
-                    [% IF ( issueloo.renewsallowed ) %]
+                    [% IF issueloo.renewsallowed && issueloo.renewsleft %]
                         <span class="renewals">([% issueloo.renewsleft %] of [% issueloo.renewsallowed %] renewals remaining)</span>
                     [% END %]
                     <span class="renewals-disabled">
@@ -521,7 +521,7 @@ function validate1(date) {
             [% ELSE %]
             <input type="checkbox" name="items[]" value="[% issueloo.itemnumber %]" onclick="uncheck_sibling(this);" />
             [% END %]
-                [% IF ( issueloo.renewsallowed ) %]
+                [% IF issueloo.renewsallowed && issueloo.renewsleft %]
                     <span class="renewals">([% issueloo.renewsleft %] of [% issueloo.renewsallowed %] renewals remaining)</span>
                 [% END %]
             [% END %]