Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[CHG] Remove unnecessary readgroup

8.0
Adrien Peiffer (ACSONE) 2016-05-25 10:35:09 +02:00 committed by Tom Blauwendraat
parent 233f3c1cce
commit 0d94426117
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web_timeline/static/src/js/web_timeline.js
View File

@ -247,7 +247,6 @@ openerp.web_timeline = function(instance) {
var self = this; var self = this;
self.last_domains = domains; self.last_domains = domains;
self.last_contexts = contexts; self.last_contexts = contexts;
// self.reload_gantt();
// select the group by // select the group by
var n_group_bys = []; var n_group_bys = [];
if (this.fields_view.arch.attrs.default_group_by) { if (this.fields_view.arch.attrs.default_group_by) {
@ -263,14 +262,7 @@ openerp.web_timeline = function(instance) {
})); }));
fields = _.uniq(fields.concat(_.pluck(this.colors, "field").concat(n_group_bys))); fields = _.uniq(fields.concat(_.pluck(this.colors, "field").concat(n_group_bys)));
var group_by = self.fields[_.first(n_group_bys)] return $.when(this.has_been_loaded).then(function() {
var read_groups = new instance.web.DataSet(this, group_by.relation, group_by.context)
.name_search('', group_by.domain)
.then(function(groups){
self.groups = groups;
});
return $.when(this.has_been_loaded, read_groups).then(function() {
return self.dataset.read_slice(fields, { return self.dataset.read_slice(fields, {
domain: domains, domain: domains,
context: contexts context: contexts
@ -304,7 +296,6 @@ openerp.web_timeline = function(instance) {
var self = this; var self = this;
var data = []; var data = [];
var groups = []; var groups = [];
groups.push({id:-1, content: _t('Undefined')})
_.each(tasks, function(event) { _.each(tasks, function(event) {
if (event[self.date_start]){ if (event[self.date_start]){
data.push(self.event_data_transform(event)); data.push(self.event_data_transform(event));
@ -315,12 +306,15 @@ openerp.web_timeline = function(instance) {
if (group_bys.length === 0) if (group_bys.length === 0)
return tasks; return tasks;
var groups = []; var groups = [];
groups.push({id:-1, content: _t('-')})
_.each(tasks, function(task) { _.each(tasks, function(task) {
var group_name = task[_.first(group_bys)]; var group_name = task[_.first(group_bys)];
var group = _.find(groups, function(group) { return _.isEqual(group.id, group_name[0]); }); if (group_name) {
if (group === undefined) { var group = _.find(groups, function(group) { return _.isEqual(group.id, group_name[0]); });
group = {id: group_name[0], content: group_name[1]}; if (group === undefined) {
groups.push(group); group = {id: group_name[0], content: group_name[1]};
groups.push(group);
}
} }
}); });
return groups; return groups;