LP#1012308: Teach the staff client to use titlesort

At least in some places.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Ben Shum <bshum@biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index d4c48b0..1331e19 100644 (file)
--- 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');
+                }
             }
         },
         {