Merge branch 'master' into em-device-ports-json

Conflicts: Netdisco/share/views/ajax/datatabledefaults.tt
2014-11-16 22:41:02 +00:00
parent 269cbf8708 a8208121c2
commit 7f2a9b7c3b
4 changed files with 7 additions and 0 deletions
--- a/Netdisco/share/views/ajax/datatabledefaults.tt
+++ b/Netdisco/share/views/ajax/datatabledefaults.tt
@@ -45,6 +45,10 @@
      data.search.search = "";
      // make sure paging position is not saved
      data.start = 0;
+      [% IF is_custom_report %]
+      // disable sorting for custom reports
+      data.order = "";
+      [% END %]
    },
    "stateLoadParams": function (settings, data) {
      // load all sidebar settings