summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-03 15:48:08 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-03 15:48:08 +0100
commite3541fca4619b6d6458c376067d299d11f15a2b8 (patch)
tree41450cdd1603714842af8a3a99781a88a9bcfdf7 /ishtar_common/templates
parentc5a639a8c59c6aa0d9edf1895cdced3cbdebc7a2 (diff)
parentc9608717bfb09c3a52336666358c0cf816c65d76 (diff)
downloadIshtar-e3541fca4619b6d6458c376067d299d11f15a2b8.tar.bz2
Ishtar-e3541fca4619b6d6458c376067d299d11f15a2b8.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/blocks/JQueryJqGrid.html2
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index faa2d9e93..607f81f7d 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -84,7 +84,7 @@ jQuery(document).ready(function(){
{{extra_cols|safe}}
],
height: 300,
- sortname: 'value',
+ sortname: '__default__',
viewrecords: true,
sortorder: "asc",
emptyrecords: "{{no_result}}",
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index 4a81a64fb..f751cebe3 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -27,7 +27,7 @@ setTimeout(
{name:'link', index:'link', width:30},
{{extra_cols|safe}}
],
- sortname: 'value',
+ sortname: '__default__',
viewrecords: true,
sortorder: "asc",
emptyrecords: "{{no_result}}",