From 83adbebf92586d81a332b2c8d442566ec292a18b Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 1 Aug 2019 11:44:39 +0000 Subject: [PATCH] Bug 23408: Move relatives-issues-table to an include TO test: 1 - Find and adult patron 2 - Add a child account 3 - Check out some things to the child 4 - View the adults account, click 'Relatives checkouts' 5 - Observe table is oddly formatted 6 - View on both the 'Check out' and 'Details' tabs 7 - Apply patch 8 - Tables are displayed correctly --- .../prog/en/includes/relatives-issues-table.inc | 25 ++++++++++++++++++++++ .../prog/en/modules/circ/circulation.tt | 24 +-------------------- .../prog/en/modules/members/moremember.tt | 23 +------------------- 3 files changed, 27 insertions(+), 45 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc new file mode 100644 index 0000000000..28addf4815 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc @@ -0,0 +1,25 @@ +[% USE Koha %] +[% IF ( relatives_issues_count ) %] +
+ + + + + + + + + + + + + + + + + + + +
Due date (unformatted, hidden)Due dateTitleItem typeCollection codeLocationChecked out on (hidden, unformatted)Checked out onChecked out fromCall noChargeFinePricePatron
+
+[% END %] 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 84c3833d71..eba096c688 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -858,29 +858,7 @@ [% INCLUDE "checkouts-table.inc" %] - [% IF ( relatives_issues_count ) %] -
- - - - - - - - - - - - - - - - - - -
Due date (unformatted, hidden)Due dateTitleItem typeCollection codeLocationChecked out onChecked out fromCall noChargeFinePricePatron
-
- [% END %] + [% INCLUDE "relatives-issues-table.inc" %] [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
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 05cb6c9478..86d26a586f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -723,28 +723,7 @@ [% INCLUDE "checkouts-table.inc" %] - [% IF ( relatives_issues_count ) %] -
- - - - - - - - - - - - - - - - - -
Due date hidden not formattedDue dateTitleItem typeLocationChecked out onChecked out fromCall noChargeFinePricePatron
-
- [% END %] + [% INCLUDE "relatives-issues-table.inc" %]
[% IF ( fines ) %] -- 2.11.0