From b8c1cf1b65e78902f0f8742a86f0e7fdda54745e Mon Sep 17 00:00:00 2001 From: vishmita Date: Tue, 20 Dec 2011 12:05:19 +0530 Subject: [FIX]Process-subflows must have unique names. lp bug: https://launchpad.net/bugs/906073 fixed bzr revid: vja@vja-desktop-20111220063519-epd6nrs2ysz4lqhu --- addons/web_process/static/src/js/process.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'addons/web_process/static/src/js/process.js') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index e650530a914..ad2816f654c 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -46,8 +46,16 @@ openerp.web_process = function (openerp) { self.graph_get().done(function(res) { self.process_notes = res.notes; self.process_title = res.name; - self.process_subflows = _.filter(res.nodes, function(x) { - return x.subflow != false; + var subflow= {}; + var process_subflow = []; + self.process_subflows = _.all(res.nodes, function(x) { + if (x.subflow != false) { + if(!subflow[x.subflow [0]]){ + subflow[x.subflow [0]] = true; + process_subflow.push(x); + } + } + return process_subflow; }); self.process_related = res.related; def.resolve(res); -- cgit v1.2.3 From ece5ba53c74a2b944ba34e5372ec343c94c233fa Mon Sep 17 00:00:00 2001 From: vishmita Date: Thu, 22 Dec 2011 13:10:26 +0530 Subject: [FIX]Improve code. bzr revid: vja@vja-desktop-20111222074026-tixnqpwpgpueuqye --- addons/web_process/static/src/js/process.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'addons/web_process/static/src/js/process.js') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index ad2816f654c..387520e44c2 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -48,13 +48,14 @@ openerp.web_process = function (openerp) { self.process_title = res.name; var subflow= {}; var process_subflow = []; - self.process_subflows = _.all(res.nodes, function(x) { - if (x.subflow != false) { - if(!subflow[x.subflow [0]]){ - subflow[x.subflow [0]] = true; - process_subflow.push(x); + self.process_subflows = _.filter(res.nodes, function(x) { + var a = _.uniq(_.map(_.pluck(res.nodes,'subflow'),function(subflow){return subflow[0]})); + for(var i = 0;i< a.length;i++){ + if(a[i] == x.subflow[0] && !subflow[x.subflow[0]]){ + subflow[x.subflow[0]] = true; + process_subflow.push(x); + } } - } return process_subflow; }); self.process_related = res.related; -- cgit v1.2.3 From bbe9f88c016a608bc63d46580e978a961bd108b5 Mon Sep 17 00:00:00 2001 From: vishmita Date: Wed, 11 Jan 2012 14:58:00 +0530 Subject: [FIX]Improve code. bzr revid: vja@vja-desktop-20120111092800-x0muv9nt5wspqhmq --- addons/web_process/static/src/js/process.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'addons/web_process/static/src/js/process.js') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 387520e44c2..026d3cb2eb7 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -46,18 +46,9 @@ openerp.web_process = function (openerp) { self.graph_get().done(function(res) { self.process_notes = res.notes; self.process_title = res.name; - var subflow= {}; - var process_subflow = []; - self.process_subflows = _.filter(res.nodes, function(x) { - var a = _.uniq(_.map(_.pluck(res.nodes,'subflow'),function(subflow){return subflow[0]})); - for(var i = 0;i< a.length;i++){ - if(a[i] == x.subflow[0] && !subflow[x.subflow[0]]){ - subflow[x.subflow[0]] = true; - process_subflow.push(x); - } - } - return process_subflow; - }); + self.process_subflows = _(res.nodes).chain() + .filter(function (node) { return node['subflow'] !== false; }) + .uniq(false, function (node) { return node['subflow'][0]; }).value(); self.process_related = res.related; def.resolve(res); }); -- cgit v1.2.3 From fca894050a13315f05f26b1fb4ec833d72916356 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 11 Jan 2012 12:06:48 +0100 Subject: [IMP] Refactored web.Dialog (again) bzr revid: fme@openerp.com-20120111110648-thxst5ot0te60fj5 --- addons/web_process/static/src/js/process.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_process/static/src/js/process.js') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 8d4396ba403..52a3d5c7656 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -286,7 +286,7 @@ openerp.web_process = function (openerp) { $(this).dialog('destroy'); }} ] - }).start().open(); + }).open(); action_manager.appendTo(dialog.$element); action_manager.do_action({ -- cgit v1.2.3 From 7373de6fe608b3ea06fea74689422c50d3ae8861 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 13 Jan 2012 18:54:05 +0100 Subject: [IMP] move fields_get display from process view to debug dropdown bzr revid: xmo@openerp.com-20120113175405-buakxhqmq76gev24 --- addons/web_process/static/src/js/process.js | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'addons/web_process/static/src/js/process.js') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 79f9c8875a8..601973d4cb5 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -28,8 +28,7 @@ openerp.web_process = function (openerp) { }, initialize_process_view: function() { var self = this; - $.when(this.fields_get(), this.help(), this.get_process_object()).pipe(function(fields, help, process) { - self.process_fields = fields; + $.when(this.help(), this.get_process_object()).pipe(function(help, process) { self.process_help = help; if(process && process.length) { if(process.length > 1) { @@ -78,17 +77,6 @@ openerp.web_process = function (openerp) { }); return def.promise(); }, - fields_get : function() { - var self = this, - def = $.Deferred(), - dataset = new openerp.web.DataSetStatic(this, this.model || this.dataset.model, this.session.context); - dataset - .call('fields_get',[]) - .done(function(fields) { - def.resolve(fields); - }).fail(def.reject); - return def.promise(); - }, help : function() { var self = this, def = $.Deferred(); @@ -145,11 +133,6 @@ openerp.web_process = function (openerp) { self.initialize_process_view(); }); - this.$element.find(".toggle_fields").click(function() { - $(this).children().toggle(); - self.$element.find('.process_fields').toggle(); - }); - this.$element.find(".process_subflow").click(function() { self.process_id = this.id; self.initialize_process_view(); -- cgit v1.2.3