odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #520 from odoo-dev/master-default-order-ged 

[MERGE] Add support for per-view default order in list/kanban views (task #8527)
This commit is contained in:
odony 2014-06-23 11:04:46 +02:00
parent 4d779733ec 31a8d3db3c
commit 5c0804eaef
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/web/static/src/js/data.js
View File

@ -21,6 +21,17 @@ instance.web.serialize_sort = function (criterion) {
}).join(', ');
};
/**
* Reverse of the serialize_sort function: convert an array of SQL-like sort
* descriptors into a list of fields prefixed with '-' if necessary.
*/
instance.web.deserialize_sort = function (criterion) {
return _.map(criterion, function (criteria) {
var split = _.without(criteria.split(' '), '');
return (split[1] && split[1].toLowerCase() === 'desc' ? '-' : '') + split[0];
});
};
instance.web.Query = instance.web.Class.extend({
init: function (model, fields) {
this._model = model;
@ -685,6 +696,15 @@ instance.web.DataSet = instance.web.Class.extend(instance.web.PropertiesMixin,
this._sort.unshift((reverse ? '-' : '') + field);
return undefined;
},
/**
* Set the sort criteria on the dataset.
*
* @param {Array} fields_list: list of fields order descriptors, as used by
* Odoo's ORM (such as 'name desc', 'product_id', 'order_date asc')
*/
set_sort: function (fields_list) {
this._sort = instance.web.deserialize_sort(fields_list);
},
size: function () {
return this.ids.length;
},

6
addons/web/static/src/js/view_list.js
View File

@ -354,6 +354,12 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
this.sidebar.$el.hide();
}
//Sort
var default_order = this.fields_view.arch.attrs.default_order,
unsorted = !this.dataset._sort.length;
if (unsorted && default_order) {
this.dataset.set_sort(default_order.split(','));
}
if(this.dataset._sort.length){
if(this.dataset._sort[0].indexOf('-') == -1){
this.$el.find('th[data-id=' + this.dataset._sort[0] + ']').addClass("sortdown");

8
addons/web_kanban/static/src/js/kanban.js
View File

@ -62,6 +62,14 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
},
load_kanban: function(data) {
this.fields_view = data;
// use default order if defined in xml description
var default_order = this.fields_view.arch.attrs.default_order,
unsorted = !this.dataset._sort.length;
if (unsorted && default_order) {
this.dataset.set_sort(default_order.split(','));
}
this.$el.addClass(this.fields_view.arch.attrs['class']);
this.$buttons = $(QWeb.render("KanbanView.buttons", {'widget': this}));
if (this.options.$buttons) {