Vaibhav (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-bug-919175-case1-vda into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #919175 in OpenERP Web: "[6.1] Process view doesn't work"
https://bugs.launchpad.net/openerp-web/+bug/919175
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-919175-case1-vda/+merge/90677
case 1: state of current process.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-919175-case1-vda/+merge/90677
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-bug-919175-case1-vda.
=== modified file 'addons/web_process/static/src/js/process.js'
--- addons/web_process/static/src/js/process.js 2012-01-25 08:53:10 +0000
+++ addons/web_process/static/src/js/process.js 2012-01-30 11:20:35 +0000
@@ -28,6 +28,11 @@
},
initialize_process_view: function() {
var self = this;
+ this.record_id = false;
+ if(this.active_view == 'page' || this.active_view == 'form') {
+ this.record_id = this.views[this.active_view].controller.datarecord.id;
+ }
+
$.when(this.help(), this.get_process_object()).pipe(function(help, process) {
self.process_help = help;
if(process && process.length) {
@@ -65,7 +70,7 @@
this.process_id = parseInt(this.process_id, 10);
this.process_dataset
- .call("graph_get",[this.process_id, this.model || this.dataset.model, false, [80,80,150,100]])
+ .call("graph_get",[this.process_id, this.model || this.dataset.model, this.record_id, [80,80,150,100]])
.done(function(res) {
self.process_dataset
.call("search_by_model",[self.model || self.dataset.model,self.session.context])
@@ -194,6 +199,10 @@
to += from;
}
}
+
+ if(n.node.res)
+ new_notes = n.node.res.name + '\n' + new_notes;
+
process_node_desc = r.text(n.node.x+85, n.node.y+50, (new_notes));
r['image']('/web/static/src/img/icons/gtk-info.png', n.node.x+20, n.node.y+70, 16, 16)
.attr({"cursor": "pointer", "title": "Help"})
@@ -220,7 +229,7 @@
node['res_model'] = self.model,
node['res_id'] = false,
node['id'] = node_id;
- process_graph.addNode(node['name'], {node: node,render: process_renderer});
+ process_graph.addNode(node.id, {node: node,render: process_renderer});
});
_.each(res['transitions'], function(transitions) {
@@ -228,7 +237,7 @@
var dst = res['nodes'][transitions['target']];
// make active
transitions['active'] = src.active && !dst.gray;
- process_graph.addEdge(src['name'], dst['name'], {directed : true});
+ process_graph.addEdge(src.id, dst.id, {directed : true});
});
var width = $(document).width();
var height = $(document).height();
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
