Browse Source

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 <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
3.16.x
Jonathan Druart 9 years ago
committed by Galen Charlton
parent
commit
bb96da8ff8
  1. 3
      koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
  2. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
  3. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
  4. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
  5. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
  6. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
  7. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
  8. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
  9. 3
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
  10. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
  11. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
  12. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
  13. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
  14. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
  15. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
  16. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
  17. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
  18. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
  19. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
  20. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
  21. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt

3
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
};

4
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 },
],

2
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 %]

2
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"
}));
});

2
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"
}));

2
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"
}));
});

1
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"
}));
});

2
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"
}));

3
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
}));
});
//]]>

1
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
}));

2
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"
}));
});

2
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 %]
});

2
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"
}));
});

2
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"
}));
});

2
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'] }

4
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt

@ -8,9 +8,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>

2
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"
}));

2
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] },

2
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 %]

4
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' %]
[% INCLUDE 'intranet-bottom.inc' %]

2
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");

Loading…
Cancel
Save