Attachment 20387 Details for Bug 9456 – Bug 9456 - Add callnumber column to the cart - Followup - Move sort filters to datatables.js

[patch] Bug 9456 - Add callnumber column to the cart - Followup - Move sort filters to datatables.js

Bug-9456---Add-callnumber-column-to-the-cart---Fol.patch (text/plain), 3.56 KB, created by Jonathan Druart on 2013-08-16 07:33:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-08-16 07:33:02 UTC

Size: 3.56 KB

patch

obsolete

>From 7fa41bf240ee407298459d7cc55729745e22a645 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 7 May 2013 12:24:56 -0400
>Subject: [PATCH] Bug 9456 - Add callnumber column to the cart - Followup -
> Move sort filters to datatables.js
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |   37 +++++++++++++++++++-
> .../intranet-tmpl/prog/en/modules/basket/basket.tt |   35 ------------------
> 2 files changed, 36 insertions(+), 36 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>index fc24036..0ff05c4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>@@ -537,4 +537,39 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, {
>         }
>     });
> 
>-}());
>\ No newline at end of file
>+}());
>+
>+/* 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
>--- 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": [
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9456: 14779 | 14780 | 14782 | 14783 | 14861 | 14903 | 14904 | 15542 | 15544 | 15727 | 15728 | 15759 | 15760 | 15813 | 15844 | 15845 | 15846 | 15847 | 15848 | 15937 | 15938 | 15941 | 15943 | 15944 | 15949 | 15950 | 16630 | 16631 | 16734 | 17994 | 17995 | 17996 | 17997 | 19123 | 19124 | 19125 | 19126 | 19146 | 19844 | 19845 | 19846 | 19847 | 19848 | 19849 | 20341 | 20385 | 20386 | 20387 | 20388 | 20389 | 20390