Merge branch 'master' into og-autoload

Conflicts: Netdisco/share/config.yml
2014-07-01 21:50:01 +01:00
parent 13957e82dc 58e5d05ac0
commit 95b6cb61b3
60 changed files with 124 additions and 70 deletions
--- 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: '
    },
--- 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 %]
+[% END %]
--- 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: '
        },