Bug 9456: (follow-up) move sort filters to datatables.js

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
index cca389d..5015da2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
@@ -580,3 +580,38 @@ $.fn.dataTableExt.oSort['nsb-nse-desc'] = function(a,b) {
     b = b.replace(pattern, "");
     return (b > a) ? 1 : ((b < a) ? -1 : 0);
 }
+
+/* Define two custom functions (asc and desc) for basket callnumber sorting */
+jQuery.fn.dataTableExt.oSort['callnumbers-asc']  = function(x,y) {
+        var x_array = x.split("<div>");
+        var y_array = y.split("<div>");
+
+        /* Pop the first elements, they are empty strings */
+        x_array.shift();
+        y_array.shift();
+
+        x_array.sort();
+        y_array.sort();
+
+        x = x_array.shift();
+        y = y_array.shift();
+
+        return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+};
+
+jQuery.fn.dataTableExt.oSort['callnumbers-desc'] = function(x,y) {
+        var x_array = x.split("<div>");
+        var y_array = y.split("<div>");
+
+        /* Pop the first elements, they are empty strings */
+        x_array.shift();
+        y_array.shift();
+
+        x_array.sort();
+        y_array.sort();
+
+        x = x_array.pop();
+        y = y_array.pop();
+
+        return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+};

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
index b2fecc7..81ace53 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
@@ -90,41 +90,6 @@ function placeHold () {
         $(".hold").text(_("Place Hold"));
         $("#downloadcartc").empty();
 
-        /* Define two custom functions (asc and desc) for string sorting */
-        jQuery.fn.dataTableExt.oSort['callnumbers-asc']  = function(x,y) {
-                var x_array = x.split("<div>");
-                var y_array = y.split("<div>");
-
-                /* Pop the first elements, they are empty strings */
-                x_array.shift();
-                y_array.shift();
-
-                x_array.sort();
-                y_array.sort();
-
-                x = x_array.shift();
-                y = y_array.shift();
-
-                return ((x < y) ? -1 : ((x > y) ?  1 : 0));
-        };
-
-        jQuery.fn.dataTableExt.oSort['callnumbers-desc'] = function(x,y) {
-                var x_array = x.split("<div>");
-                var y_array = y.split("<div>");
-
-                /* Pop the first elements, they are empty strings */
-                x_array.shift();
-                y_array.shift();
-
-                x_array.sort();
-                y_array.sort();
-
-                x = x_array.pop();
-                y = y_array.pop();
-
-                return ((x < y) ?  1 : ((x > y) ? -1 : 0));
-        };
-
         $("#itemst").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sDom": 't',
             "aoColumnDefs": [