From b343d1c308b6d7549f0289b470f58fd45afb5c58 Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Tue, 12 Jun 2012 14:08:04 -0400 Subject: [PATCH] LP#1012308: Teach the staff client to use titlesort At least in some places. Signed-off-by: Thomas Berezansky Signed-off-by: Michele Morgan Signed-off-by: Ben Shum --- Open-ILS/xul/staff_client/server/circ/util.js | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index d4c48b0fd2..1331e192c2 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -1203,7 +1203,7 @@ circ.util.columns = function(modify,params) { 'id' : 'title', 'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'), 'flex' : 2, - 'sort_type' : 'title', +// 'sort_type' : 'title', 'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { @@ -1216,6 +1216,19 @@ circ.util.columns = function(modify,params) { } else { return my.acp.dummy_title(); } + }, + 'sort_value' : function(my) { + if (my.mvr) { + if (my.mvr.doc_id() == -1) { + return my.acp.dummy_title(); + } else if (my.mvr.titlesort()) { + return my.mvr.titlesort(); + } else { + return my.mvr.title(); + } + } else { + return my.acp.dummy_title(); + } } }, { @@ -1626,6 +1639,19 @@ circ.util.transit_columns = function(modify,params) { 'editable' : false, 'render' : function(my) { try { return my.mvr.title(); } catch(E) { return my.acp.dummy_title(); } + }, + 'sort_value' : function(my) { + if (my.mvr) { + if (my.mvr.doc_id() == -1) { + return my.acp.dummy_title(); + } else if (my.mvr.titlesort()) { + return my.mvr.titlesort(); + } else { + return my.mvr.title(); + } + } else { + return my.acp.dummy_title(); + } } }, { @@ -2269,7 +2295,7 @@ circ.util.hold_columns = function(modify,params) { 'id' : 'title', 'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'), 'flex' : 1, - 'sort_type' : 'title', +// 'sort_type' : 'title', 'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { @@ -2278,6 +2304,17 @@ circ.util.hold_columns = function(modify,params) { } else { return document.getElementById('circStrings').getString('staff.circ.utils.title.none'); } + }, + 'sort_value' : function(my) { + if (my.mvr) { + if (my.mvr.titlesort()) { + return my.mvr.titlesort(); + } else { + return my.mvr.title(); + } + } else { + return document.getElementById('circStrings').getString('staff.circ.utils.title.none'); + } } }, { -- 2.43.2