From a0aeb34e4616892e03c3319299982201f507e1d3 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 6 May 2022 12:19:36 +0100 Subject: [PATCH] Bug 30695: (QA follow-up) Catch moremember.tt too This patch does the same treatment for moremember.tt where the same summary block is includes. We also correct the tab order to be a little more consistent too. We should really move this to an include and refer to it from both templates instead of this copy/paste code.. Signed-off-by: Martin Renvoize --- .../prog/en/modules/circ/circulation.tt | 4 +- .../prog/en/modules/members/moremember.tt | 55 +++++++++---------- 2 files changed, 28 insertions(+), 31 deletions(-) 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 de00bc3213..f7cd93de71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -841,7 +841,9 @@ [% END %] -
  • Restrictions ([% debarments.count || 0 | html %])
  • +
  • + Restrictions ([% debarments.count || 0 | html %]) +
  • [% SET enrollments = patron.get_club_enrollments %] [% SET enrollable = patron.get_enrollable_clubs(0) %] 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 292f754c04..3063cad1b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -633,11 +633,11 @@
    [% INCLUDE "checkouts-table.inc" %] @@ -730,12 +725,6 @@
    [% END %] - [% IF Koha.Preference('UseRecalls') %] -
    - [% INCLUDE 'recalls.inc' %] -
    - [% END %] - [% INCLUDE borrower_debarments.inc %] [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] @@ -808,6 +797,12 @@ [% # /div#reserves %] [% END %] + [% IF Koha.Preference('UseRecalls') %] +
    + [% INCLUDE 'recalls.inc' %] +
    + [% END %] + [% IF Koha.Preference('ClaimReturnedLostValue') %] [% INCLUDE 'patron-return-claims.inc' %] [% END %] -- 2.20.1