diff --git a/Netdisco/Changes b/Netdisco/Changes index fe78e744..891967dc 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,5 +1,9 @@ 2.027008_002 - 2014-06-23 + [ENHANCEMENTS] + + * table_pagesize option to set default size of table pages + [BUG FIXES] * Subnets report date range fixed, but (unnecessary?) "not" option removed diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod index d691f6da..5e5b131f 100644 --- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod +++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod @@ -294,6 +294,12 @@ Value: Boolean. Default: true. Set to "C" if you MUST maintain backwards compatibility with the Netdisco 1.x web interface. Strongly recommended that you leave this set to "C". +=head3 C + +Value: Number. Default: 10. + +The number of rows in a table page. + =head2 Netdisco Core =head3 C diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml index 8479600f..ba065c19 100644 --- a/Netdisco/share/config.yml +++ b/Netdisco/share/config.yml @@ -79,6 +79,7 @@ extra_web_plugins: [] jobqueue_refresh: 10 safe_password_store: true reports: {} +table_pagesize: 10 # ------------- # NETDISCO CORE diff --git a/Netdisco/share/views/ajax/admintask/orphaned_csv.tt b/Netdisco/share/views/ajax/admintask/orphaned_csv.tt index a87372f0..d07433b2 100644 --- a/Netdisco/share/views/ajax/admintask/orphaned_csv.tt +++ b/Netdisco/share/views/ajax/admintask/orphaned_csv.tt @@ -48,4 +48,4 @@ [% END %] [% END %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/admintask/pseudodevice.tt b/Netdisco/share/views/ajax/admintask/pseudodevice.tt index 6322491a..2184f163 100644 --- a/Netdisco/share/views/ajax/admintask/pseudodevice.tt +++ b/Netdisco/share/views/ajax/admintask/pseudodevice.tt @@ -65,7 +65,7 @@ $(document).ready(function() { $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/admintask/slowdevices.tt b/Netdisco/share/views/ajax/admintask/slowdevices.tt index 2ad98f5c..256cb412 100644 --- a/Netdisco/share/views/ajax/admintask/slowdevices.tt +++ b/Netdisco/share/views/ajax/admintask/slowdevices.tt @@ -33,7 +33,7 @@ $(document).ready(function() { "searching": false, "info": false, "order": [[ 4, 'desc' ], [ 0, 'asc' ], [ 1, 'asc' ] ], - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], } ); } ); diff --git a/Netdisco/share/views/ajax/admintask/topology.tt b/Netdisco/share/views/ajax/admintask/topology.tt index a3676040..50f57731 100644 --- a/Netdisco/share/views/ajax/admintask/topology.tt +++ b/Netdisco/share/views/ajax/admintask/topology.tt @@ -91,7 +91,7 @@ $(document).ready(function() { $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt index e3d060ad..f1071460 100644 --- a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt +++ b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt @@ -29,7 +29,7 @@ $(document).ready(function() { $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/admintask/userlog.tt b/Netdisco/share/views/ajax/admintask/userlog.tt index 8654f9e0..1b9efd11 100644 --- a/Netdisco/share/views/ajax/admintask/userlog.tt +++ b/Netdisco/share/views/ajax/admintask/userlog.tt @@ -19,7 +19,7 @@ $(document).ready(function() { $('#aul-data-table').dataTable( { "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/admintask/users.tt b/Netdisco/share/views/ajax/admintask/users.tt index 90f013b6..89db1e5c 100644 --- a/Netdisco/share/views/ajax/admintask/users.tt +++ b/Netdisco/share/views/ajax/admintask/users.tt @@ -80,7 +80,7 @@ $(document).ready(function() { $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt index b0edd0db..941b7941 100644 --- a/Netdisco/share/views/ajax/device/addresses.tt +++ b/Netdisco/share/views/ajax/device/addresses.tt @@ -15,7 +15,7 @@ $(document).ready(function() { var table = $('#da-data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/device/addresses_csv.tt b/Netdisco/share/views/ajax/device/addresses_csv.tt index c9388a05..501120b0 100644 --- a/Netdisco/share/views/ajax/device/addresses_csv.tt +++ b/Netdisco/share/views/ajax/device/addresses_csv.tt @@ -8,4 +8,4 @@ [% END %] [% CSV.dump(mylist) %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt index b1cfbbd0..3bef8142 100644 --- a/Netdisco/share/views/ajax/device/ports.tt +++ b/Netdisco/share/views/ajax/device/ports.tt @@ -389,7 +389,7 @@ $(document).ready(function() { "order": [[ 1, 'asc' ]], "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/apchanneldist.tt b/Netdisco/share/views/ajax/report/apchanneldist.tt index 8d68bc2f..4abc7f3c 100644 --- a/Netdisco/share/views/ajax/report/apchanneldist.tt +++ b/Netdisco/share/views/ajax/report/apchanneldist.tt @@ -12,7 +12,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/apradiochannelpower.tt b/Netdisco/share/views/ajax/report/apradiochannelpower.tt index eb103733..94a469b3 100644 --- a/Netdisco/share/views/ajax/report/apradiochannelpower.tt +++ b/Netdisco/share/views/ajax/report/apradiochannelpower.tt @@ -40,7 +40,7 @@ $(document).ready(function() { var table = $('#data-table').DataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/deviceaddrnodns.tt b/Netdisco/share/views/ajax/report/deviceaddrnodns.tt index 7d8b3386..94b17416 100644 --- a/Netdisco/share/views/ajax/report/deviceaddrnodns.tt +++ b/Netdisco/share/views/ajax/report/deviceaddrnodns.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/devicebylocation.tt b/Netdisco/share/views/ajax/report/devicebylocation.tt index 830a2290..07a3c6a6 100644 --- a/Netdisco/share/views/ajax/report/devicebylocation.tt +++ b/Netdisco/share/views/ajax/report/devicebylocation.tt @@ -15,7 +15,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/devicednsmismatch.tt b/Netdisco/share/views/ajax/report/devicednsmismatch.tt index b915429b..fba189cb 100644 --- a/Netdisco/share/views/ajax/report/devicednsmismatch.tt +++ b/Netdisco/share/views/ajax/report/devicednsmismatch.tt @@ -15,7 +15,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/devicepoestatus.tt b/Netdisco/share/views/ajax/report/devicepoestatus.tt index 4cd3c097..a162e21e 100644 --- a/Netdisco/share/views/ajax/report/devicepoestatus.tt +++ b/Netdisco/share/views/ajax/report/devicepoestatus.tt @@ -66,7 +66,7 @@ $(document).ready(function() { var table = $('#data-table').DataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/devicepoestatus_csv.tt b/Netdisco/share/views/ajax/report/devicepoestatus_csv.tt index 001fc125..ff61ea6d 100644 --- a/Netdisco/share/views/ajax/report/devicepoestatus_csv.tt +++ b/Netdisco/share/views/ajax/report/devicepoestatus_csv.tt @@ -16,4 +16,4 @@ [% END %] [% CSV.dump(mydlist) %] -[%END%] \ No newline at end of file +[%END%] diff --git a/Netdisco/share/views/ajax/report/duplexmismatch.tt b/Netdisco/share/views/ajax/report/duplexmismatch.tt index f1c44dab..3404320f 100644 --- a/Netdisco/share/views/ajax/report/duplexmismatch.tt +++ b/Netdisco/share/views/ajax/report/duplexmismatch.tt @@ -16,7 +16,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/duplexmismatch_csv.tt b/Netdisco/share/views/ajax/report/duplexmismatch_csv.tt index 934c5cbd..c3a88b8d 100644 --- a/Netdisco/share/views/ajax/report/duplexmismatch_csv.tt +++ b/Netdisco/share/views/ajax/report/duplexmismatch_csv.tt @@ -10,4 +10,4 @@ [% END %] [% CSV.dump(mylist) %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/generic_report.tt b/Netdisco/share/views/ajax/report/generic_report.tt index 4560a7bd..7d3aac74 100644 --- a/Netdisco/share/views/ajax/report/generic_report.tt +++ b/Netdisco/share/views/ajax/report/generic_report.tt @@ -22,7 +22,7 @@ $(document).ready(function() { $('#rg-data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' } diff --git a/Netdisco/share/views/ajax/report/halfduplex.tt b/Netdisco/share/views/ajax/report/halfduplex.tt index 79d8f8ce..3cd0ee29 100644 --- a/Netdisco/share/views/ajax/report/halfduplex.tt +++ b/Netdisco/share/views/ajax/report/halfduplex.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/halfduplex_csv.tt b/Netdisco/share/views/ajax/report/halfduplex_csv.tt index c0a4aa35..a3aeb767 100644 --- a/Netdisco/share/views/ajax/report/halfduplex_csv.tt +++ b/Netdisco/share/views/ajax/report/halfduplex_csv.tt @@ -9,4 +9,4 @@ [% END %] [% CSV.dump(mylist) %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/ipinventory.tt b/Netdisco/share/views/ajax/report/ipinventory.tt index f3363568..12e011a0 100644 --- a/Netdisco/share/views/ajax/report/ipinventory.tt +++ b/Netdisco/share/views/ajax/report/ipinventory.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/moduleinventory.tt b/Netdisco/share/views/ajax/report/moduleinventory.tt index f64d03d7..b84b96bd 100644 --- a/Netdisco/share/views/ajax/report/moduleinventory.tt +++ b/Netdisco/share/views/ajax/report/moduleinventory.tt @@ -32,7 +32,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/moduleinventory_csv.tt b/Netdisco/share/views/ajax/report/moduleinventory_csv.tt index 3c4e7687..432dd02b 100644 --- a/Netdisco/share/views/ajax/report/moduleinventory_csv.tt +++ b/Netdisco/share/views/ajax/report/moduleinventory_csv.tt @@ -22,4 +22,4 @@ [% CSV.dump(mylist) %] [% END %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/netbios.tt b/Netdisco/share/views/ajax/report/netbios.tt index 544f7bd2..3a30f3c6 100644 --- a/Netdisco/share/views/ajax/report/netbios.tt +++ b/Netdisco/share/views/ajax/report/netbios.tt @@ -28,7 +28,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/netbios_csv.tt b/Netdisco/share/views/ajax/report/netbios_csv.tt index 1362398a..1b560c3c 100644 --- a/Netdisco/share/views/ajax/report/netbios_csv.tt +++ b/Netdisco/share/views/ajax/report/netbios_csv.tt @@ -24,4 +24,4 @@ [% CSV.dump(mylist) %] [% END %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/nodemultiips.tt b/Netdisco/share/views/ajax/report/nodemultiips.tt index 54cdb54c..b3a8279d 100644 --- a/Netdisco/share/views/ajax/report/nodemultiips.tt +++ b/Netdisco/share/views/ajax/report/nodemultiips.tt @@ -15,7 +15,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/nodevendor.tt b/Netdisco/share/views/ajax/report/nodevendor.tt index b2bbfcfd..22b01bf5 100644 --- a/Netdisco/share/views/ajax/report/nodevendor.tt +++ b/Netdisco/share/views/ajax/report/nodevendor.tt @@ -28,7 +28,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/nodevendor_csv.tt b/Netdisco/share/views/ajax/report/nodevendor_csv.tt index 3f28ec7e..64ecd60a 100644 --- a/Netdisco/share/views/ajax/report/nodevendor_csv.tt +++ b/Netdisco/share/views/ajax/report/nodevendor_csv.tt @@ -23,4 +23,4 @@ [% CSV.dump(mylist) %] [% END %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/phonesdiscovered.tt b/Netdisco/share/views/ajax/report/phonesdiscovered.tt index 7ca7ec4a..503badfc 100644 --- a/Netdisco/share/views/ajax/report/phonesdiscovered.tt +++ b/Netdisco/share/views/ajax/report/phonesdiscovered.tt @@ -16,7 +16,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt b/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt index 4a266f14..d2a79202 100644 --- a/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt +++ b/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt @@ -9,4 +9,4 @@ [% END %] [% CSV.dump(mylist) %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/portadmindown.tt b/Netdisco/share/views/ajax/report/portadmindown.tt index b63220be..143b909d 100644 --- a/Netdisco/share/views/ajax/report/portadmindown.tt +++ b/Netdisco/share/views/ajax/report/portadmindown.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/portblocking.tt b/Netdisco/share/views/ajax/report/portblocking.tt index be47eff2..4995be42 100644 --- a/Netdisco/share/views/ajax/report/portblocking.tt +++ b/Netdisco/share/views/ajax/report/portblocking.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/portlog.tt b/Netdisco/share/views/ajax/report/portlog.tt index ccdc7bfa..1616980c 100644 --- a/Netdisco/share/views/ajax/report/portlog.tt +++ b/Netdisco/share/views/ajax/report/portlog.tt @@ -32,7 +32,7 @@ $(document).ready(function() { $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' } diff --git a/Netdisco/share/views/ajax/report/portmultinodes.tt b/Netdisco/share/views/ajax/report/portmultinodes.tt index b66fdf33..f8d67e7a 100644 --- a/Netdisco/share/views/ajax/report/portmultinodes.tt +++ b/Netdisco/share/views/ajax/report/portmultinodes.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/portssid.tt b/Netdisco/share/views/ajax/report/portssid.tt index c3f32545..ce8270ee 100644 --- a/Netdisco/share/views/ajax/report/portssid.tt +++ b/Netdisco/share/views/ajax/report/portssid.tt @@ -28,7 +28,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/portssid_csv.tt b/Netdisco/share/views/ajax/report/portssid_csv.tt index 02c27277..613e772c 100644 --- a/Netdisco/share/views/ajax/report/portssid_csv.tt +++ b/Netdisco/share/views/ajax/report/portssid_csv.tt @@ -23,4 +23,4 @@ [% CSV.dump(mylist) %] [% END %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/portutilization.tt b/Netdisco/share/views/ajax/report/portutilization.tt index bab6889e..822f0bee 100644 --- a/Netdisco/share/views/ajax/report/portutilization.tt +++ b/Netdisco/share/views/ajax/report/portutilization.tt @@ -15,7 +15,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/portutilization_csv.tt b/Netdisco/share/views/ajax/report/portutilization_csv.tt index c2c5b3ac..c5e9c2f9 100644 --- a/Netdisco/share/views/ajax/report/portutilization_csv.tt +++ b/Netdisco/share/views/ajax/report/portutilization_csv.tt @@ -9,4 +9,4 @@ [% END %] [% CSV.dump(mylist) %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/report/subnets.tt b/Netdisco/share/views/ajax/report/subnets.tt index 82c0c9a8..fab5e1d8 100644 --- a/Netdisco/share/views/ajax/report/subnets.tt +++ b/Netdisco/share/views/ajax/report/subnets.tt @@ -26,7 +26,7 @@ $(document).ready(function() { $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/report/vlaninventory.tt b/Netdisco/share/views/ajax/report/vlaninventory.tt index 76124112..a7aee16e 100644 --- a/Netdisco/share/views/ajax/report/vlaninventory.tt +++ b/Netdisco/share/views/ajax/report/vlaninventory.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/search/device.tt b/Netdisco/share/views/ajax/search/device.tt index 8980291e..b36f61b8 100644 --- a/Netdisco/share/views/ajax/search/device.tt +++ b/Netdisco/share/views/ajax/search/device.tt @@ -19,7 +19,7 @@ $(document).ready(function() { var table = $('#ds-data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/search/device_csv.tt b/Netdisco/share/views/ajax/search/device_csv.tt index d84986df..2af3dd11 100644 --- a/Netdisco/share/views/ajax/search/device_csv.tt +++ b/Netdisco/share/views/ajax/search/device_csv.tt @@ -9,4 +9,4 @@ [% END %] [% CSV.dump(mylist) %] -[% END %] \ No newline at end of file +[% END %] diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt index 03f8fbc9..879c6967 100644 --- a/Netdisco/share/views/ajax/search/node_by_ip.tt +++ b/Netdisco/share/views/ajax/search/node_by_ip.tt @@ -177,7 +177,7 @@ $(document).ready(function() { var table = $('#nsbi-data-table').DataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt index 01a91cc8..ec4f2578 100644 --- a/Netdisco/share/views/ajax/search/node_by_mac.tt +++ b/Netdisco/share/views/ajax/search/node_by_mac.tt @@ -137,7 +137,7 @@ $(document).ready(function() { var table = $('#nsbm-data-table').DataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/search/port.tt b/Netdisco/share/views/ajax/search/port.tt index 3fe91428..16a4f928 100644 --- a/Netdisco/share/views/ajax/search/port.tt +++ b/Netdisco/share/views/ajax/search/port.tt @@ -14,7 +14,7 @@ $(document).ready(function() { var table = $('#ps-data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' }, diff --git a/Netdisco/share/views/ajax/search/vlan.tt b/Netdisco/share/views/ajax/search/vlan.tt index 2b63b2ff..010d54b8 100644 --- a/Netdisco/share/views/ajax/search/vlan.tt +++ b/Netdisco/share/views/ajax/search/vlan.tt @@ -16,7 +16,7 @@ $(document).ready(function() { var table = $('#vs-data-table').dataTable({ "processing": true, "stateSave": true, - "pageLength": 25, + "pageLength": [% settings.table_pagesize %], "language": { "search": 'Filter records: ' },