Bugzilla – Attachment 27139 Details for
Bug 12089
Remove use of dt_add_type_uk_date()
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12089 - Remove use of dt_add_type_uk_date() - Circulation
Bug-12089---Remove-use-of-dtaddtypeukdate---Circul.patch (text/plain), 8.60 KB, created by
Owen Leonard
on 2014-04-15 18:36:40 UTC
(
hide
)
Description:
Bug 12089 - Remove use of dt_add_type_uk_date() - Circulation
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2014-04-15 18:36:40 UTC
Size:
8.60 KB
patch
obsolete
>From fdc51871e15636ac7f163e467c7efd3166aab9ec Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 15 Apr 2014 14:04:33 -0400 >Subject: [PATCH] Bug 12089 - Remove use of dt_add_type_uk_date() - > Circulation >Content-Type: text/plain; charset="utf-8" > >This patch removes instances of dt_add_type_uk_date() from there >circulation templates and updates the sorting configuration according to >current guidelines. > >To test, enable the UseTablesortForCirc system preference and open a >patron for circulation who has multiple items checked out. Confirm that >sorting by due date, title, and checkout date work correctly. > >Locate a patron who is guarantor to another or is guaranteed by another. >One or both patrons should have checkouts. The "relatives checkouts" tab >on the checkout page should sort correctly on due date, title, and >checkout date. > >On the transfers to receive report, confirm that sorting by date of >transfer and title work correctly for all tables. > >On the holds awaiting pickup report the "available since" and title >columns should sort correctly for tables in both tabs (waiting and >over). >--- > .../prog/en/modules/circ/circulation.tt | 28 ++++++++++---------- > .../prog/en/modules/circ/transferstoreceive.tt | 12 +++------ > .../prog/en/modules/circ/waitingreserves.tt | 13 +++++---- > 3 files changed, 24 insertions(+), 29 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 d1a36ae..62d5134 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -23,7 +23,6 @@ > //<![CDATA[ > var MSG_ADD_MESSAGE = _("Add a new message"); > var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); >-[% IF ( UseTablesortForCirc && dateformat == 'metric' ) %]dt_add_type_uk_date();[% END %] > [% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %] > [% UNLESS ( borrowernumber ) %][% UNLESS ( CGIselectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] > $(document).ready(function() { >@@ -42,10 +41,9 @@ var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); > "sDom": 't', > "aaSorting": [], > "aoColumnDefs": [ >- { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false } >- ], >- "aoColumns": [ >- { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,null,null[% IF ( exports_enabled ) %],null[% END %] >+ { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false }, >+ { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >+ { "sType": "title-string", "aTargets" : [ "title-string" ] } > ], > "bPaginate": false > })); >@@ -53,8 +51,10 @@ var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); > $("#relissuest").dataTable($.extend(true, {}, dataTablesDefaults, { > "sDom": 't', > "aaSorting": [], >- "aoColumns": [ >- { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,{ "sType": "html" } >+ "aoColumnDefs": [ >+ { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >+ { "sType": "title-string", "aTargets" : [ "title-string" ] }, >+ { "sType": "html", "aTargets" : [ "html-content" ] } > ], > "bPaginate": false > })); >@@ -715,10 +715,10 @@ No patron matched <span class="ex">[% message %]</span> > <input type="hidden" name="branch" value="[% branch %]" /> > <table id="issuest"> > <thead><tr> >- <th scope="col">Due date</th> >- <th scope="col">Title</th> >+ <th scope="col" class="title-string">Due date</th> >+ <th scope="col" class="anti-the">Title</th> > <th scope="col">Item type</th> >- <th scope="col">Checked out on</th> >+ <th scope="col" class="title-string">Checked out on</th> > <th scope="col">Checked out from</th> > <th scope="col">Call no</th> > <th scope="col">Charge</th> >@@ -964,15 +964,15 @@ No patron matched <span class="ex">[% message %]</span> > <table id="relissuest"> > <thead> > <tr> >- <th scope="col">Due date</th> >- <th scope="col">Title</th> >+ <th scope="col" class="title-string">Due date</th> >+ <th scope="col" class="anti-the">Title</th> > <th scope="col">Item type</th> >- <th scope="col">Checked out on</th> >+ <th scope="col" class="title-string">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">Price</th> >- <th scope="col">Patron</th> >+ <th scope="col" class="html-content">Patron</th> > </tr> > </thead> > [% IF ( relissues ) %] <tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index d3cc93b..e1cc760 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -6,17 +6,13 @@ > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >-[% IF (dateformat == 'metric') %] >-dt_add_type_uk_date(); >-[% END %] > $(document).ready(function() { > [% FOREACH branchesloo IN branchesloop %] > $("#transferst[% branchesloo.branchcode %]").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ > { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, >- ], >- "aoColumns": [ >- { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null >+ { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >+ { "sType": "title-string", "aTargets" : [ "title-string" ] } > ], > "sDom": 't', > "bPaginate": false >@@ -48,8 +44,8 @@ $(document).ready(function() { > <table style="width: 100%" id="transferst[% branchesloo.branchcode %]"> > <caption>Coming from [% branchesloo.branchname %]</caption> > <thead><tr> >- <th>Date of transfer</th> >- <th>Title</th> >+ <th class="title-string">Date of transfer</th> >+ <th class="anti-the">Title</th> > <th>On hold for</th> > <th>Home library</th> > <th>Call no.</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index 6edfd85..0bc2e34 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -15,9 +15,8 @@ dt_add_type_uk_date(); > $("#holdst,#holdso").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ > { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, >- ], >- "aoColumns": [ >- { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null,null >+ { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >+ { "sType": "title-string", "aTargets" : [ "title-string" ] } > ], > "sPaginationType": "four_button" > })); >@@ -81,8 +80,8 @@ dt_add_type_uk_date(); > [% IF ( reserveloop ) %] > <table id="holdst"> > <thead><tr> >- <th>Available since</th> >- <th>Title</th> >+ <th class="title-string">Available since</th> >+ <th class="anti-the">Title</th> > <th>Patron</th> > <th>Location</th> > <th>Copy number</th> >@@ -141,8 +140,8 @@ dt_add_type_uk_date(); > <br/> > <table id="holdso"> > <thead><tr> >- <th>Available since</th> >- <th>Title</th> >+ <th class="title-string">Available since</th> >+ <th class="anti-the">Title</th> > <th>Patron</th> > <th>Location</th> > <th>Copy number</th> >-- >1.7.9.5
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 12089
:
27139
|
27143
|
27223
|
27224
|
27260
|
27261
|
27507
|
27508
|
27509
|
27510
|
27511
|
27512
|
27676
|
27677
|
27678
|
27679
|
27680