From: Thomas Berezansky Date: Tue, 12 Jun 2012 18:08:04 +0000 (-0400) Subject: Teach the staff client to use titlesort X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8177c0b400e24e8c843cfa2aae20812eada516e8;p=working%2FEvergreen.git Teach the staff client to use titlesort At least in some places. Signed-off-by: Thomas Berezansky --- diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 5e766b2906..8c6cb75b55 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -1270,7 +1270,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) { @@ -1283,6 +1283,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(); + } } }, { @@ -1722,6 +1735,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(); + } } }, { @@ -2363,7 +2389,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) { @@ -2372,6 +2398,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'); + } } }, {