From 8f5d050ff5fff8b332af28ab46ee4ba395a5ef15 Mon Sep 17 00:00:00 2001 From: QS5ELkMu Date: Mon, 25 Jun 2018 14:46:48 +0200 Subject: [PATCH 1/6] [FIX] Chatter Position --- web_responsive/static/src/js/web_responsive.js | 1 - web_responsive/views/inherited_view_users_form_simple_modif.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/web_responsive/static/src/js/web_responsive.js b/web_responsive/static/src/js/web_responsive.js index 56e60fac2..bbc861751 100644 --- a/web_responsive/static/src/js/web_responsive.js +++ b/web_responsive/static/src/js/web_responsive.js @@ -10,7 +10,6 @@ odoo.define('web_responsive', function(require) { var core = require('web.core'); var config = require('web.config'); var ViewManager = require('web.ViewManager'); - var Session = require('web.session'); Menu.include({ diff --git a/web_responsive/views/inherited_view_users_form_simple_modif.xml b/web_responsive/views/inherited_view_users_form_simple_modif.xml index ac389f854..9e465ba8a 100644 --- a/web_responsive/views/inherited_view_users_form_simple_modif.xml +++ b/web_responsive/views/inherited_view_users_form_simple_modif.xml @@ -13,7 +13,7 @@ - + From 3de495cb6045c4770ba36f84ce4420de4f45baae Mon Sep 17 00:00:00 2001 From: QS5ELkMu Date: Mon, 25 Jun 2018 15:26:20 +0200 Subject: [PATCH 2/6] [FIX] Read/Write permissions --- web_responsive/models/inherited_res_users.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web_responsive/models/inherited_res_users.py b/web_responsive/models/inherited_res_users.py index f567f3aa6..1de66bda8 100644 --- a/web_responsive/models/inherited_res_users.py +++ b/web_responsive/models/inherited_res_users.py @@ -7,6 +7,20 @@ from odoo import models, fields class ResUsers(models.Model): _inherit = 'res.users' + def __init__(self, pool, cr): + """ Override of __init__ to add access rights on notification_email_send + and alias fields. Access rights are disabled by default, but allowed + on some specific fields defined in self.SELF_{READ/WRITE}ABLE_FIELDS. + """ + init_res = super(ResUsers, self).__init__(pool, cr) + # duplicate list to avoid modifying the original reference + type(self).SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS) + type(self).SELF_WRITEABLE_FIELDS.extend(['chatter_position']) + # duplicate list to avoid modifying the original reference + type(self).SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS) + type(self).SELF_READABLE_FIELDS.extend(['chatter_position']) + return init_res + chatter_position = fields.Selection([ ('normal', 'Normal'), ('sided', 'Sided'), From 900b24d9eb2f3d6b26b75fdec0c92b4e679d9b44 Mon Sep 17 00:00:00 2001 From: QS5ELkMu Date: Mon, 25 Jun 2018 15:29:29 +0200 Subject: [PATCH 3/6] [CLEAN] Comments --- web_responsive/models/inherited_res_users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_responsive/models/inherited_res_users.py b/web_responsive/models/inherited_res_users.py index 1de66bda8..537864780 100644 --- a/web_responsive/models/inherited_res_users.py +++ b/web_responsive/models/inherited_res_users.py @@ -8,8 +8,8 @@ class ResUsers(models.Model): _inherit = 'res.users' def __init__(self, pool, cr): - """ Override of __init__ to add access rights on notification_email_send - and alias fields. Access rights are disabled by default, but allowed + """ Override of __init__ to add access rights. + Access rights are disabled by default, but allowed on some specific fields defined in self.SELF_{READ/WRITE}ABLE_FIELDS. """ init_res = super(ResUsers, self).__init__(pool, cr) From 4612c14ae02cc89b09741728ba73170573214469 Mon Sep 17 00:00:00 2001 From: QS5ELkMu Date: Mon, 25 Jun 2018 17:25:13 +0200 Subject: [PATCH 4/6] [IMP] Code --- web_responsive/models/inherited_res_users.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web_responsive/models/inherited_res_users.py b/web_responsive/models/inherited_res_users.py index 537864780..f584a7a24 100644 --- a/web_responsive/models/inherited_res_users.py +++ b/web_responsive/models/inherited_res_users.py @@ -7,21 +7,21 @@ from odoo import models, fields class ResUsers(models.Model): _inherit = 'res.users' + chatter_position = fields.Selection([ + ('normal', 'Normal'), + ('sided', 'Sided'), + ], string="Chatter Position", default='normal') + + def __init__(self, pool, cr): """ Override of __init__ to add access rights. - Access rights are disabled by default, but allowed - on some specific fields defined in self.SELF_{READ/WRITE}ABLE_FIELDS. + Access rights are disabled by default, but allowed on some specific + fields defined in self.SELF_{READ/WRITE}ABLE_FIELDS. """ - init_res = super(ResUsers, self).__init__(pool, cr) + super(ResUsers, self).__init__(pool, cr) # duplicate list to avoid modifying the original reference type(self).SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS) type(self).SELF_WRITEABLE_FIELDS.extend(['chatter_position']) # duplicate list to avoid modifying the original reference type(self).SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS) type(self).SELF_READABLE_FIELDS.extend(['chatter_position']) - return init_res - - chatter_position = fields.Selection([ - ('normal', 'Normal'), - ('sided', 'Sided'), - ], string="Chatter Position", default='normal') From d6fb3c67cd8646eaf263692fec4341bcaa0b8e34 Mon Sep 17 00:00:00 2001 From: QS5ELkMu Date: Tue, 26 Jun 2018 16:50:13 +0200 Subject: [PATCH 5/6] [IMP] Adding res.users chatter_position read/write test --- web_responsive/models/inherited_res_users.py | 1 - web_responsive/tests/__init__.py | 1 + web_responsive/tests/test_res_users.py | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 web_responsive/tests/test_res_users.py diff --git a/web_responsive/models/inherited_res_users.py b/web_responsive/models/inherited_res_users.py index f584a7a24..7b80a9790 100644 --- a/web_responsive/models/inherited_res_users.py +++ b/web_responsive/models/inherited_res_users.py @@ -12,7 +12,6 @@ class ResUsers(models.Model): ('sided', 'Sided'), ], string="Chatter Position", default='normal') - def __init__(self, pool, cr): """ Override of __init__ to add access rights. Access rights are disabled by default, but allowed on some specific diff --git a/web_responsive/tests/__init__.py b/web_responsive/tests/__init__.py index 6dab214ac..cabee0673 100644 --- a/web_responsive/tests/__init__.py +++ b/web_responsive/tests/__init__.py @@ -1 +1,2 @@ from . import test_ui +from . import test_res_users diff --git a/web_responsive/tests/test_res_users.py b/web_responsive/tests/test_res_users.py new file mode 100644 index 000000000..e835b310b --- /dev/null +++ b/web_responsive/tests/test_res_users.py @@ -0,0 +1,15 @@ +# Copyright 2018 Alexandre Díaz +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo.tests import common + +class TestResUsers(common.TransactionCase): + + def test_chatter_position_wr(self): + user_public = self.env.ref('base.public_user') + + self.assertEqual(user_public.chatter_position, 'normal') + user_public.sudo(user_public).write({ + 'chatter_position': 'sided', + }) + self.assertEqual(user_public.chatter_position, 'sided') From eb6013fe7c2610dee6cbd939bd4fd010e54defb6 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 27 Jun 2018 08:44:36 +0100 Subject: [PATCH 6/6] Fix linter --- web_responsive/tests/test_res_users.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web_responsive/tests/test_res_users.py b/web_responsive/tests/test_res_users.py index e835b310b..6f4f03221 100644 --- a/web_responsive/tests/test_res_users.py +++ b/web_responsive/tests/test_res_users.py @@ -3,6 +3,7 @@ from odoo.tests import common + class TestResUsers(common.TransactionCase): def test_chatter_position_wr(self):