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

[FIX] Fixed diagram view 

bzr revid: fme@openerp.com-20121206095123-4nybio4m9dtb9z9o
This commit is contained in:
Fabien Meghazi 2012-12-06 10:51:23 +01:00
parent 21927bc249
commit 6637e05898
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,6 @@ import openerp
class DiagramView(openerp.addons.web.controllers.main.View):
_cp_path = "/web_diagram/diagram"
@openerp.addons.web.http.jsonrequest
def load(self, req, model, view_id):
fields_view = self.fields_view_get(req, model, view_id, 'diagram')
return {'fields_view': fields_view}
@openerp.addons.web.http.jsonrequest
def get_diagram_info(self, req, id, model, node, connector,
src_node, des_node, label, **kw):

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

@ -9,6 +9,7 @@ var QWeb = instance.web.qweb,
instance.web.views.add('diagram', 'instance.web.DiagramView');
instance.web.DiagramView = instance.web.View.extend({
display_name: _lt('Diagram'),
view_type: 'diagram',
searchable: false,
init: function(parent, dataset, view_id, options) {
var self = this;
@ -24,12 +25,6 @@ instance.web.DiagramView = instance.web.View.extend({
this.on('view_loaded', self, self.load_diagram);
this.on('pager_action_executed', self, self.pager_action_trigger);
},
start: function() {
var self = this;
return this.rpc("/web_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}).done(function(r) {
self.load_diagram(r);
});
},
toTitleCase: function(str) {
return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
@ -41,7 +36,7 @@ instance.web.DiagramView = instance.web.View.extend({
this.id = this.ids[self.dataset.index || 0];
}
this.fields_view = result.fields_view,
this.fields_view = result,
this.view_id = this.fields_view.view_id,
this.fields = this.fields_view.fields,
this.nodes = this.fields_view.arch.children[0],