From a1fc9c04276de20691cea82b55717704f05b49b2 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Fri, 11 Oct 2019 14:59:39 +0000 Subject: [PATCH] [FIX] scaffold: clean the templates: - Add blank lines at end of python files (pep8) - Easier uncomment (entire blocks, and no remaining whitespaces in empty lines) - Add `_description` to model to avoid the warning telling it's missing - Correct compute field, `self.value` raised an `ensure_one` issue - Change access so the user can add/edit/delete records in the web interface by default - Correct the server action, `self` is not in the server action context. closes odoo/odoo#40659 X-original-commit: 622615771d0a6f8544f6810f30df46aea0e0fb9c Signed-off-by: Denis Ledoux (dle) --- .../default/__manifest__.py.template | 1 + .../controllers/controllers.py.template | 4 +- .../templates/default/demo/demo.xml.template | 12 +++--- .../default/models/models.py.template | 8 +++- .../security/ir.model.access.csv.template | 2 +- .../default/views/templates.xml.template | 38 ++++++++++--------- .../default/views/views.xml.template | 26 ++++++------- 7 files changed, 50 insertions(+), 41 deletions(-) diff --git a/odoo/cli/templates/default/__manifest__.py.template b/odoo/cli/templates/default/__manifest__.py.template index 3cb2adac44b..4ec9ab0ed33 100644 --- a/odoo/cli/templates/default/__manifest__.py.template +++ b/odoo/cli/templates/default/__manifest__.py.template @@ -33,3 +33,4 @@ 'demo/demo.xml', ], } + diff --git a/odoo/cli/templates/default/controllers/controllers.py.template b/odoo/cli/templates/default/controllers/controllers.py.template index 0dabc367ae9..de179de7d0b 100644 --- a/odoo/cli/templates/default/controllers/controllers.py.template +++ b/odoo/cli/templates/default/controllers/controllers.py.template @@ -2,7 +2,8 @@ {%- set model = "%s.%s"|format(mod, mod) -%} {%- set root = "/%s/%s"|format(mod, mod) -%} # -*- coding: utf-8 -*- -from odoo import http +# from odoo import http + # class {{ mod|pascal }}(http.Controller): # @http.route('{{ root }}/', auth='public') @@ -21,3 +22,4 @@ from odoo import http # return http.request.render('{{ mod }}.object', { # 'object': obj # }) + diff --git a/odoo/cli/templates/default/demo/demo.xml.template b/odoo/cli/templates/default/demo/demo.xml.template index 2fa8d2124a4..0104b95479c 100644 --- a/odoo/cli/templates/default/demo/demo.xml.template +++ b/odoo/cli/templates/default/demo/demo.xml.template @@ -2,11 +2,11 @@ {%- set model = "%s.%s"|format(mod, mod) -%} - - - - - - + diff --git a/odoo/cli/templates/default/models/models.py.template b/odoo/cli/templates/default/models/models.py.template index f74d15bc6b5..5c0a929a784 100644 --- a/odoo/cli/templates/default/models/models.py.template +++ b/odoo/cli/templates/default/models/models.py.template @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- -from odoo import models, fields, api +# from odoo import models, fields, api + # class {{ name|snake }}(models.Model): # _name = '{{ name|snake }}.{{ name|snake }}' +# _description = '{{ name|snake }}.{{ name|snake }}' # name = fields.Char() # value = fields.Integer() @@ -12,4 +14,6 @@ from odoo import models, fields, api # # @api.depends('value') # def _value_pc(self): -# self.value2 = float(self.value) / 100 +# for record in self: +# record.value2 = float(record.value) / 100 + diff --git a/odoo/cli/templates/default/security/ir.model.access.csv.template b/odoo/cli/templates/default/security/ir.model.access.csv.template index 71a2352fedc..01cab1087e1 100644 --- a/odoo/cli/templates/default/security/ir.model.access.csv.template +++ b/odoo/cli/templates/default/security/ir.model.access.csv.template @@ -3,4 +3,4 @@ {%- set name = "%s.%s"|format(snake_name, snake_name) -%} {%- set model_id = "model_%s_%s"|format(snake_name, snake_name) -%} id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -{{ id }},{{ name }},{{ model_id }},,1,0,0,0 +{{ id }},{{ name }},{{ model_id }},base.group_user,1,1,1,1 diff --git a/odoo/cli/templates/default/views/templates.xml.template b/odoo/cli/templates/default/views/templates.xml.template index b9f07471752..2f37b71f89d 100644 --- a/odoo/cli/templates/default/views/templates.xml.template +++ b/odoo/cli/templates/default/views/templates.xml.template @@ -1,22 +1,24 @@ - - - - - - - - - - - - - - - - - - + diff --git a/odoo/cli/templates/default/views/views.xml.template b/odoo/cli/templates/default/views/views.xml.template index a7cb15abeb6..9548cfc9497 100644 --- a/odoo/cli/templates/default/views/views.xml.template +++ b/odoo/cli/templates/default/views/views.xml.template @@ -3,7 +3,7 @@ - +--> - +--> - +--> - +--> - +--> - +-->