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/report/generic_report.tt
+++ b/Netdisco/share/views/ajax/report/generic_report.tt
@@ -20,6 +20,7 @@
 <script>
 $(document).ready(function() {
  $('#rg-data-table').dataTable({
+    "order": [],
 [% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );