From 271ba327b461bfbb8a5d097cd5d875b0e29d80c2 Mon Sep 17 00:00:00 2001 From: fwi-odoo Date: Fri, 22 Jul 2016 13:04:13 +0200 Subject: [PATCH] [MOV][IMP] web_diagram: reorganize files, add license and clean imports --- addons/web_diagram/__init__.py | 3 +++ addons/web_diagram/__openerp__.py | 7 +++++-- addons/web_diagram/controllers/__init__.py | 3 +++ addons/web_diagram/controllers/main.py | 14 ++++++++++---- .../{web_diagram.xml => web_diagram_templates.xml} | 4 ++-- 5 files changed, 23 insertions(+), 8 deletions(-) rename addons/web_diagram/views/{web_diagram.xml => web_diagram_templates.xml} (96%) diff --git a/addons/web_diagram/__init__.py b/addons/web_diagram/__init__.py index e046e49fbe2..dd15b5c32e5 100644 --- a/addons/web_diagram/__init__.py +++ b/addons/web_diagram/__init__.py @@ -1 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + from . import controllers diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py index 111d4731049..537e8785f85 100644 --- a/addons/web_diagram/__openerp__.py +++ b/addons/web_diagram/__openerp__.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + { 'name': 'Odoo Web Diagram', 'category': 'Hidden', @@ -8,8 +11,8 @@ Openerp Web Diagram view. """, 'version': '2.0', 'depends': ['web'], - 'data' : [ - 'views/web_diagram.xml', + 'data': [ + 'views/web_diagram_templates.xml', ], 'qweb': [ 'static/src/xml/*.xml', diff --git a/addons/web_diagram/controllers/__init__.py b/addons/web_diagram/controllers/__init__.py index 12a7e529b67..5d4b25db9c0 100644 --- a/addons/web_diagram/controllers/__init__.py +++ b/addons/web_diagram/controllers/__init__.py @@ -1 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + from . import main diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py index 40f5c9a5674..0b661623e3c 100644 --- a/addons/web_diagram/controllers/main.py +++ b/addons/web_diagram/controllers/main.py @@ -1,9 +1,15 @@ -import openerp -from openerp.tools.safe_eval import safe_eval as eval +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -class DiagramView(openerp.http.Controller): +import odoo +import odoo.http as http - @openerp.http.route('/web_diagram/diagram/get_diagram_info', type='json', auth='user') +from odoo.tools.safe_eval import safe_eval as eval + + +class DiagramView(http.Controller): + + @http.route('/web_diagram/diagram/get_diagram_info', type='json', auth='user') def get_diagram_info(self, req, id, model, node, connector, src_node, des_node, label, **kw): diff --git a/addons/web_diagram/views/web_diagram.xml b/addons/web_diagram/views/web_diagram_templates.xml similarity index 96% rename from addons/web_diagram/views/web_diagram.xml rename to addons/web_diagram/views/web_diagram_templates.xml index c8606506c53..2b12b218ae6 100644 --- a/addons/web_diagram/views/web_diagram.xml +++ b/addons/web_diagram/views/web_diagram_templates.xml @@ -1,5 +1,5 @@ - + - +