Bugzilla – Attachment 91944 Details for
Bug 23408
Relatives' checkout table columns are not configured properly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23408: Move relatives-issues-table to an include
Bug-23408-Move-relatives-issues-table-to-an-includ.patch (text/plain), 6.25 KB, created by
Nick Clemens (kidclamp)
on 2019-08-02 20:46:42 UTC
(
hide
)
Description:
Bug 23408: Move relatives-issues-table to an include
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2019-08-02 20:46:42 UTC
Size:
6.25 KB
patch
obsolete
>From 83adbebf92586d81a332b2c8d442566ec292a18b Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >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 ) %] >+ <div id="relatives-issues"> >+ <table id="relatives-issues-table" style="width: 100% !Important;"> >+ <thead> >+ <tr> >+ <th scope="col">Due date (unformatted, hidden)</th> >+ <th scope="col">Due date</th> >+ <th scope="col">Title</th> >+ <th scope="col">Item type</th> >+ <th scope="col">Collection code</th> >+ <th scope="col">Location</th> >+ <th scope="col">Checked out on (hidden, unformatted)</th> >+ <th scope="col">Checked out on</th> >+ <th scope="col">Checked out from</th> >+ <th scope="col">Call no</th> >+ <th scope="col">Charge</th> >+ <th scope="col">Fine</th> >+ <th scope="col">Price</th> >+ <th scope="col">Patron</th> >+ </tr> >+ </thead> >+ </table> >+ </div> >+[% 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 ) %] >- <div id="relatives-issues"> >- <table id="relatives-issues-table"> >- <thead> >- <tr> >- <th scope="col">Due date (unformatted, hidden)</th> >- <th scope="col">Due date</th> >- <th scope="col">Title</th> >- <th scope="col">Item type</th> >- <th scope="col">Collection code</th> >- <th scope="col">Location</th> >- <th scope="col">Checked out on</th> >- <th scope="col">Checked out from</th> >- <th scope="col">Call no</th> >- <th scope="col">Charge</th> >- <th scope="col">Fine</th> >- <th scope="col">Price</th> >- <th scope="col">Patron</th> >- </tr> >- </thead> >- </table> >- </div> <!-- /#relatives-issues --> >- [% END %] >+ [% INCLUDE "relatives-issues-table.inc" %] > > [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %] > <div id="clubs-tab"> >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 ) %] >- <div id="relatives-issues"> >- <table id="relatives-issues-table" style="width: 100% !Important;"> >- <thead> >- <tr> >- <th scope="col">Due date hidden not formatted</th> >- <th scope="col">Due date</th> >- <th scope="col">Title</th> >- <th scope="col">Item type</th> >- <th scope="col">Location</th> >- <th scope="col">Checked out on</th> >- <th scope="col">Checked out from</th> >- <th scope="col">Call no</th> >- <th scope="col">Charge</th> >- <th scope="col">Fine</th> >- <th scope="col">Price</th> >- <th scope="col">Patron</th> >- </tr> >- </thead> >- </table> >- </div> >- [% END %] >+ [% INCLUDE "relatives-issues-table.inc" %] > > <div id="finesandcharges"> > [% IF ( fines ) %] >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23408
:
91903
|
91944
|
91949
|
92127