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

[IMP] node shapes handling 

bzr revid: xmo@openerp.com-20111026125742-7xpcn0jo75xrfuy1
This commit is contained in:
Xavier Morel 2011-10-26 14:57:42 +02:00
parent a45785d2f8
commit 4ba8ac9d3e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/web_diagram/controllers/main.py
View File

@ -93,7 +93,6 @@ class DiagramView(View):
n.update(
id=act['id'],
color='white',
shape='ellipse',
options={}
)
for color, expr in bgcolors.items():

11
addons/web_diagram/static/src/js/diagram.js
View File

@ -121,9 +121,8 @@ openerp.web.DiagramView = openerp.web.View.extend({
//Custom logic
var self = this;
var renderer = function(r, n) {
var shape = n.node.shape;
if(shape == 'rectangle')
shape = 'rect';
var shape = (n.node.shape === 'rectangle') ? 'rect' : 'ellipse';
var node = r[shape](n.node.x, n.node.y).attr({
"fill": n.node.color
}).dblclick(function() {
@ -139,11 +138,11 @@ openerp.web.DiagramView = openerp.web.View.extend({
.dblclick(propagate_to_previous_sibling)
).attr("cursor", "pointer");
if(shape == "ellipse")
node.attr({rx: "40", ry: "20"});
else if(shape == 'rect') {
if (shape === 'rect') {
node.attr({width: "60", height: "44"});
node.next.attr({"text-anchor": "middle", x: n.node.x + 20, y: n.node.y + 20});
} else {
node.attr({rx: "40", ry: "20"});
}
return nodes;