From bb96da8ff86798df099a99e3123796731659fb67 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 24 Jan 2014 12:15:55 +0100 Subject: [PATCH] Bug 11605: fallback to default DataTables settings where possible 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 Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ---- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 -- .../intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt | 2 -- .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 2 -- .../prog/en/modules/admin/branch_transfer_limits.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 1 - .../intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt | 2 -- .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 2 -- .../prog/en/modules/course_reserves/course-details.tt | 2 -- .../prog/en/modules/course_reserves/course-reserves.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 2 -- .../prog/en/modules/reports/guided_reports_start.tt | 2 -- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt | 4 +--- koha-tmpl/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 faab715ec0..aa2dcca916 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 b537148d62..e504334387 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 219a049abe..cdf7edc399 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 aed89bc4be..1d7ee4fbd5 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 e0a22e6718..27c8b7bb6f 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 bc0f6cf80a..a10dfb357a 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 e7838d9116..f12107f9e3 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 b9e67400f6..c32094e2ac 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 e6acddb0b6..02656343a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -11,8 +11,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 2a8ce121ae..45d64c88a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -28,7 +28,6 @@ Data deleted "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 7ce8414784..dc4243dbb9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -16,8 +16,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 6e9a1ffc11..a9c8e4e670 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -39,8 +39,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 2cc539aa9b..521a8d8775 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -32,8 +32,6 @@ null, null ], - "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 10c6b8cf34..1d7182bb6f 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 403de5476f..cb9f06f1cc 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 @@ -12,8 +12,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': [ 'NoSort' ] }, { 'sType': "anti-the", 'aTargets' : [ 'antithe'] } 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 b6308003aa..14e51340ca 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 @@ -8,9 +8,7 @@ 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 beab40d212..31d40bae9d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -10,8 +10,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 2ac91d64f4..f787cacec3 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 ecd8a8e574..c4a15c4cd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -59,8 +59,6 @@ $(document).ready(function() { "aoColumns": [ null,{ "sType": "anti-the" },null,null,null,null,null ], - "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 5749ceb4bd..f6ce767b45 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 : -[% 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 db74ee3079..a8e2809bda 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"); -- 2.39.5