Bugzilla – Attachment 23139 Details for
Bug 9108
Add uk/euro date sort filter to pages which require it
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[3.10.X] Bug 9108 - Add uk/euro date sort filter to pages which require it
0001-Bug-9108-Add-uk-euro-date-sort-filter-to-pages-which.patch (text/plain), 8.88 KB, created by
Fridolin Somers
on 2013-11-25 15:44:18 UTC
(
hide
)
Description:
[3.10.X] Bug 9108 - Add uk/euro date sort filter to pages which require it
Filename:
MIME Type:
Creator:
Fridolin Somers
Created:
2013-11-25 15:44:18 UTC
Size:
8.88 KB
patch
obsolete
>From dd719db29fe7d7cc37e0551eb49d0fca159a3319 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 19 Nov 2012 15:06:33 -0500 >Subject: [PATCH 1/2] Bug 9108 - Add uk/euro date sort filter to pages which > require it > >This patch adds the JS required to enable correct sorting >of dates in DD/MM/YYYY format to pages which require it. > >To test, set your dateformat accordingly and confirm on the >affected pages that dates are sorted correctly. > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Resolved conflict in serials/serials-search.tt. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 3 +++ > .../intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 3 +++ > koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt | 9 +++++++-- > .../intranet-tmpl/prog/en/modules/serials/serials-search.tt | 3 +++ > 11 files changed, 37 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 1c452f9..3223dc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -16,6 +16,9 @@ > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> > <script type="text/JavaScript"> > //<![CDATA[ >+ [% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+ [% END %] > $(document).ready(function() { > var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index c525474..4132edb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -9,6 +9,9 @@ > <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> > <script type="text/javascript"> > //<![CDATA[ >+[% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+[% END %] > $(document).ready(function() { > var histsearcht = $("#histsearcht").dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index a04204e..88fd8b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -11,6 +11,9 @@ > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >+ [% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+ [% END %] > $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, { > bInfo: false, > bPaginate: false, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index b146060..c825d06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -11,6 +11,9 @@ > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ >+[% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+[% END %] > $(document).ready(function() { > var late_orderst = $("#late_orders").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index fbfa57a..23441f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -8,6 +8,9 @@ > <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> > <script type="text/javascript"> > //<![CDATA[ >+[% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+[% END %] > $(document).ready(function() { > var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 616139c..b3220da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -9,6 +9,9 @@ > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >+[% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+[% END %] > var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button" > } ) ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 1d6255d..95634d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -9,6 +9,9 @@ > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >+ [% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+ [% END %] > var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button" > } ) ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 8f473e5..5f8da2e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -7,6 +7,9 @@ > [% INCLUDE 'datatables-strings.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >+ [% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+ [% END %] > $("#table_issues").dataTable($.extend(true, {}, dataTablesDefaults, { > "aaSorting": [[ 4, "desc" ]] > }) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index dce66de..026e9dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -9,6 +9,9 @@ > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > $(document).ready(function() { >+ [% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+ [% END %] > var holdst = $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, { > })); > holdst.fnAddFilters("filter"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index e062fef..71359da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -6,14 +6,19 @@ > <script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script> > [% INCLUDE 'datatables-strings.inc' %] > <script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script> >-<script type="text/javascript" id="js">$(document).ready(function() { >+<script type="text/javascript" id="js"> >+//<![CDATA[ > $(document).ready(function() { >+ [% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+ [% END %] > $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button", > "aaSorting": [] > })); > }); >-}); </script> >+//]]> >+</script> > </head> > <body id="pat_readingrec" class="pat"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index 98ef4d5..908c0e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -9,6 +9,9 @@ > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >+ [% IF (dateformat == 'metric') %] >+ dt_add_type_uk_date(); >+ [% END %] > var srlt = $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ > { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false }, >-- >1.8.3.2 >
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 9108
:
13535
|
13546
|
13723
|
13724
|
14189
|
14572
|
14573
| 23139 |
23141