Bugzilla – Attachment 25133 Details for
Bug 11605
DT: default entry is 20
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11605: default entry is 20 for all tables using datatables
Bug-11605-default-entry-is-20-for-all-tables-using.patch (text/plain), 16.44 KB, created by
Kyle M Hall (khall)
on 2014-02-07 14:23:43 UTC
(
hide
)
Description:
Bug 11605: default entry is 20 for all tables using datatables
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-02-07 14:23:43 UTC
Size:
16.44 KB
patch
obsolete
>From 6785b26a452878bd1a8b7a41f93a670d23ee5f1f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 24 Jan 2014 12:15:55 +0100 >Subject: [PATCH] Bug 11605: default entry is 20 for all tables using datatables > >The default entry is 20 and can be apply to all tables. > >Bug 11555 apply the menu entries to all tables, redefining it is >uesless and can be removed. > >Test plan: >Test pages impacted by this patch and verify there is no regression on >the tables. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 3 ++- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ---- > .../prog/en/modules/admin/aqbudgets.tt | 2 -- > .../prog/en/modules/admin/auth_tag_structure.tt | 2 -- > .../prog/en/modules/admin/authorised_values.tt | 2 -- > .../en/modules/admin/branch_transfer_limits.tt | 2 -- > .../prog/en/modules/admin/branches.tt | 1 - > .../prog/en/modules/admin/categorie.tt | 2 -- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 3 +-- > .../prog/en/modules/admin/itemtypes.tt | 1 - > .../prog/en/modules/admin/marctagstructure.tt | 2 -- > .../prog/en/modules/admin/z3950servers.tt | 2 -- > .../prog/en/modules/circ/reserveratios.tt | 2 -- > .../prog/en/modules/circ/waitingreserves.tt | 2 -- > .../en/modules/course_reserves/course-details.tt | 2 -- > .../en/modules/course_reserves/course-reserves.tt | 4 +--- > .../prog/en/modules/members/notices.tt | 2 -- > .../en/modules/reports/guided_reports_start.tt | 2 -- > .../prog/en/modules/suggestion/suggestion.tt | 2 -- > .../intranet-tmpl/prog/en/modules/tags/list.tt | 4 +--- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 -- > 21 files changed, 5 insertions(+), 43 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >index faab715..aa2dcca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >@@ -24,7 +24,8 @@ var dataTablesDefaults = { > "sZeroRecords" : window.MSG_DT_ZERO_RECORDS || "No matching records found" > }, > "sDom": '<"top pager"ilpf>t<"bottom pager"ip>', >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL || "All"]] >+ "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL || "All"]], >+ "iDisplayLength": 20 > }; > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index b537148..e504334 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -20,8 +20,6 @@ > var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, { > "bStateSave": true, > "iCookieDuration": 60*60*24*1000, // 1000 days >- "iDisplayLength": 10, >- "aLengthMenu": [[5, 10, 20, 50, 100, -1], [5, 10, 20, 50, 100, _("All")]], > "aoColumnDefs": [ > { "aTargets": [ 4, 9, 10 ], "bSortable": false, "bSearchable": false }, > ], >@@ -63,8 +61,6 @@ > var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, { > "bStateSave": true, > "iCookieDuration": 60*60*24*1000, // 1000 days >- "iDisplayLength": 10, >- "aLengthMenu": [[5, 10, 20, 50, 100, -1], [5, 10, 20, 50, 100, _("All")]], > "aoColumnDefs": [ > { "aTargets": [ 5, -1 ], "bSortable": false, "bSearchable": false }, > ], >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index 219a049..cdf7edc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -190,8 +190,6 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > "aoColumnDefs": [ > { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, > ], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index aed41b6..213f00a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -14,8 +14,6 @@ > "aoColumnDefs": [ > { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false }, > ], >- "iDisplayLength": 20, >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], > "sPaginationType": "four_button" > })); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index e0a22e6..27c8b7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -16,8 +16,6 @@ > { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, > ], > "aaSorting": [[ 1, "asc" ]], >- "iDisplayLength": 20, >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], > "sPaginationType": "four_button" > })); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index bc0f6cf..a10dfb3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -35,8 +35,6 @@ > "aoColumnDefs": [ > { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, > ], >- "iDisplayLength": 20, >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], > "sPaginationType": "four_button" > })); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index e7838d9..f12107f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -22,7 +22,6 @@ > { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, > ], > "iDisplayLength": 10, >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], > "sPaginationType": "four_button" > })); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >index ce7f014..4fdacb4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >@@ -17,8 +17,6 @@ > { "aTargets": [ 3,4,5 ], "sType": "natural" }, > ], > "aaSorting": [[ 1, "asc" ]], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 8b8cc66..a13718b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -18,8 +18,7 @@ > { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, > ], > "aaSorting": [[ 1, "asc" ]], >- "iDisplayLength": 10, >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >+ "iDisplayLength": 10 > })); > }); > //]]> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index 57847eb..6b6ad2b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -82,7 +82,6 @@ function Check(f) { > "aoColumnDefs": [ > { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, > ], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], > "aaSorting": [[ 2, "asc" ]], > "iDisplayLength": 10 > })); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index c905f30..f82dd78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -31,8 +31,6 @@ $(document).ready(function() { > "aoColumnDefs": [ > { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false }, > ], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 915e531..09e1c21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -76,8 +76,6 @@ > "aoColumnDefs": [ > { "aTargets": [ 2,3,4,7,8,9,10,11 ], "bSortable": false, "bSearchable": false }, > ], >- "iDisplayLength": 20, >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], > "sPaginationType": "four_button" > }));[% END %] > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index d55382e..9743051 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -20,8 +20,6 @@ > "aoColumnDefs": [ > { "aTargets": [ 8 ], "sType": "natural" } > ], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > }); >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 10c6b8c..1d7182b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -17,8 +17,6 @@ dt_add_type_uk_date(); > "aoColumnDefs": [ > { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, > ], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index 5e69702..f75c82d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -14,8 +14,6 @@ > $(document).ready(function(){ > $("#course_reserves_table").dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "four_button", >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "aoColumnDefs": [ > { 'bSortable': false, 'aTargets': [ 9, 10, 11 ] } > ] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index 820c1a2..bfa2d24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -10,9 +10,7 @@ > <script type="text/javascript" id="js"> > $(document).ready(function() { > $("#course_reserves_table").dataTable($.extend(true, {}, dataTablesDefaults, { >- "sPaginationType": "four_button", >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20 >+ "sPaginationType": "four_button" > })); > }); > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index f3727f7..eaf0a84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -12,8 +12,6 @@ > $("#noticestable").dataTable($.extend(true, {}, dataTablesDefaults, { > "aaSorting": [[ 3, "desc" ]], > "aoColumns": [ null,null,null,{ "sType": "title-string" } ], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 2ac91d6..f787cac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -68,8 +68,6 @@ $(document).ready(function(){ > 'bAutoWidth': false, > 'sDom': 't<"bottom pager"ilpf>', > 'sPaginationType': 'four_button', >- 'aLengthMenu': [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- 'iDisplayLength': 20, > 'aaSorting': [[ 1, "asc" ]], > 'aoColumnDefs': [ > { 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1, -2, -3, -4] }, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index cd5b958..a562143 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -58,8 +58,6 @@ $(document).ready(function() { > "aoColumnDefs": [ > { "aTargets": [ 0, -1, -2 ], "bSortable": false, "bSearchable": false }, > ], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > [% FOREACH suggestion IN suggestions %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index 5749ceb..f6ce767 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -19,8 +19,6 @@ > { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, > ], > "aaSorting": [[ 0, "asc" ]], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > }); >@@ -100,4 +98,4 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </ul> > </div> > </div> >-[% INCLUDE 'intranet-bottom.inc' %] >\ No newline at end of file >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index db74ee3..a8e2809 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -136,8 +136,6 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > null,null,null,null,null,null,[% UNLESS ( filter_approved_pending ) %]null,[% END %]{ "sType": "title-string" } > ], > "aaSorting": [[ 4, "desc" ]], >- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], >- "iDisplayLength": 20, > "sPaginationType": "four_button" > })); > var reviewerField = $("#approver"); >-- >1.7.2.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 11605
:
24672
|
24897
|
24997
|
24998
|
24999
| 25133 |
25134