From ff691a34b5b25ff2365ac8c0ba451757c50cfbf8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 4 May 2011 16:05:35 +0200
Subject: [ADD] sorting support in list views

* Fix sorting in DataSet.do_search_read (would not fix ordering of read results, yielding a semi-random order instead of the one returned by search)
* Add sort parameter support to ListView.fill()
* Improve handling of sort parameter on DataSetSearch
  - Queue up fields to sort on (most important last) by calling 'dataset.sort(fieldname)' repeatedly
  - Get back a sort string fit for sending to OpenERP (server) by calling 'dataset.sort()' (without arguments)
* Adds sorting on list view by clicking on headers

bzr revid: xmo@openerp.com-20110504140535-ydj8zs33lt0dgcwy
---
 addons/base/static/src/js/data.js | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

(limited to 'addons/base/static/src/js/data.js')

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 6d566f4de0a..c7c129e7fec 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -144,7 +144,7 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
     init: function(session, model) {
         this._super(session, model);
         this.domain = [];
-        this.sort = [];
+        this._sort = [];
         this.offset = 0;
         // subset records[offset:offset+limit]
         // is it necessary ?
@@ -166,7 +166,7 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
             fields: fields,
             domain: this.domain,
             context: this.context,
-            sort: this.sort,
+            sort: this.sort(),
             offset: offset,
             limit: limit
         }, function (records) {
@@ -177,6 +177,35 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
             }
             callback(records);
         });
+    },
+    /**
+     * Reads or changes sort criteria on the dataset.
+     *
+     * If not provided with any argument, serializes the sort criteria to
+     * an SQL-like form usable by OpenERP's ORM.
+     *
+     * If given a field, will set that field as first sorting criteria or,
+     * if the field is already the first sorting criteria, will reverse it.
+     *
+     * @param {String} [field] field to sort on, reverses it (toggle from ASC to DESC) if already the main sort criteria
+     * @param {Boolean} [force_reverse=false] forces inserting the field as DESC
+     * @returns {String|undefined}
+     */
+    sort: function (field, force_reverse) {
+        if (!field) {
+            return _.map(this._sort, function (criteria) {
+                if (criteria[0] === '-') {
+                    return criteria.slice(1) + ' DESC';
+                }
+                return criteria;
+            }).join(', ');
+        }
+
+        var reverse = force_reverse || (this._sort[0] === field);
+        this._sort = _.without(this._sort, field, '-' + field);
+
+        this._sort.unshift((reverse ? '-' : '') + field);
+        return undefined;
     }
 });
 
-- 
cgit v1.2.3


From 075902f5c2b0febd70adf5209b4eef2cfb0813b8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 4 May 2011 16:47:53 +0200
Subject: [IMP] make sortable columns look sortable (and sorted) a bit

bzr revid: xmo@openerp.com-20110504144753-zemygt44re3o8z0m
---
 addons/base/static/src/js/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base/static/src/js/data.js')

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index c7c129e7fec..da0f18001a8 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -197,7 +197,7 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
                 if (criteria[0] === '-') {
                     return criteria.slice(1) + ' DESC';
                 }
-                return criteria;
+                return criteria + ' ASC';
             }).join(', ');
         }
 
-- 
cgit v1.2.3