diff --git a/base_group_backend/__manifest__.py b/base_group_backend/__manifest__.py index 26b4c584..cd445f0c 100644 --- a/base_group_backend/__manifest__.py +++ b/base_group_backend/__manifest__.py @@ -19,5 +19,4 @@ "security/ir.model.access.csv", ], "installable": True, - "application": True } diff --git a/base_group_backend/demo/__init__.py b/base_group_backend/demo/__init__.py index 0c180055..87682b5e 100644 --- a/base_group_backend/demo/__init__.py +++ b/base_group_backend/demo/__init__.py @@ -1,5 +1,4 @@ from odoo.tools import config -if not config['without_demo']: +if not config["without_demo"]: from . import backend_dummy_model - diff --git a/base_group_backend/demo/backend_dummy_model.py b/base_group_backend/demo/backend_dummy_model.py index 49fd4b12..561ef811 100644 --- a/base_group_backend/demo/backend_dummy_model.py +++ b/base_group_backend/demo/backend_dummy_model.py @@ -1,11 +1,16 @@ from odoo import fields, models + class BackendDummyModel(models.Model): _name = "backend.dummy.model" _inherit = ["mail.activity.mixin"] - _description = 'Nothing to see here' + _description = "Backend Dummy Model demo" my_value = fields.Char(name="Value", required=True) my_other_value = fields.Char(name="Other value", required=True) - date_start = fields.Datetime(name="Date start", required=True, default=fields.Datetime.now) - date_stop = fields.Datetime(name="Date stop", required=True, default=fields.Datetime.now) + date_start = fields.Datetime( + name="Date start", required=True, default=fields.Datetime.now + ) + date_stop = fields.Datetime( + name="Date stop", required=True, default=fields.Datetime.now + ) diff --git a/base_group_backend/demo/backend_dummy_model.xml b/base_group_backend/demo/backend_dummy_model.xml index 927f9bca..3af728dd 100644 --- a/base_group_backend/demo/backend_dummy_model.xml +++ b/base_group_backend/demo/backend_dummy_model.xml @@ -1,43 +1,45 @@ - + - - - Backend dummy tree view - backend.dummy.model - - - - - - - - - Dummies - ir.actions.act_window - backend.dummy.model - tree,form,kanban,calendar,pivot,graph,activity - - - - - - + + + Backend dummy tree view + backend.dummy.model + + + + + + + + + + Dummies + ir.actions.act_window + backend.dummy.model + tree,form,kanban,calendar,pivot,graph,activity + + + + + + + diff --git a/base_group_backend/demo/ir.model.access.csv b/base_group_backend/demo/ir.model.access.csv index fb5cf586..95d560f9 100644 --- a/base_group_backend/demo/ir.model.access.csv +++ b/base_group_backend/demo/ir.model.access.csv @@ -1,3 +1,3 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_backend_dummy_models","backend_dummy_model all","base_group_backend.model_backend_dummy_model",group_backend,1,0,0,0 -"access_backend_dummy_models_all","backend_dummy_model all","base_group_backend.model_backend_dummy_model",base.group_user,1,0,0,0 +"backend_dummy_models","backend dummy.model","model_backend_dummy_model",group_backend,1,0,0,0 +"backend_dummy_models_user_grp","backend dummy.model user grp","model_backend_dummy_model",base.group_user,1,0,0,0 diff --git a/base_group_backend/demo/test-model.xml b/base_group_backend/demo/test-model.xml index 70db2080..42caa5cc 100644 --- a/base_group_backend/demo/test-model.xml +++ b/base_group_backend/demo/test-model.xml @@ -1,8 +1,8 @@ - - - hello - hello - - + + + hello + hello + + diff --git a/base_group_backend/models/res_users.py b/base_group_backend/models/res_users.py index 51c51b8f..8c456e5e 100644 --- a/base_group_backend/models/res_users.py +++ b/base_group_backend/models/res_users.py @@ -8,7 +8,6 @@ _logger = logging.getLogger(__name__) class Users(models.Model): _inherit = "res.users" - # TODO: (franz) make it clear why we test with "." group and why the share = True @api.model def has_group(self, group_ext_id): @@ -33,10 +32,14 @@ class Users(models.Model): return has_base_group_backend return res - @api.depends('groups_id') + @api.depends("groups_id") def _compute_share(self): - user_group_id = self.env['ir.model.data']._xmlid_to_res_id('base.group_user') - backend_user_group_id = self.env['ir.model.data']._xmlid_to_res_id('base_group_backend.group_backend') - internal_users = self.filtered_domain([('groups_id', 'in', [user_group_id, backend_user_group_id])]) + user_group_id = self.env["ir.model.data"]._xmlid_to_res_id("base.group_user") + backend_user_group_id = self.env["ir.model.data"]._xmlid_to_res_id( + "base_group_backend.group_backend" + ) + internal_users = self.filtered_domain( + [("groups_id", "in", [user_group_id, backend_user_group_id])] + ) internal_users.share = False (self - internal_users).share = True diff --git a/base_group_backend/security/ir.model.access.csv b/base_group_backend/security/ir.model.access.csv index 26e0c9f0..c5b504a1 100644 --- a/base_group_backend/security/ir.model.access.csv +++ b/base_group_backend/security/ir.model.access.csv @@ -1,13 +1,13 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_res_users_all,res_users all,model_res_users,group_backend,1,0,0,0 -access_res_partners_all,res_partners all,base.model_res_partner,group_backend,1,0,0,0 -access_ir_ui_menu_group_user,ir_ui_menu group_user,base.model_ir_ui_menu,group_backend,1,0,0,0 -access_ir_filter_user,ir_filters all,base.model_ir_filters,group_backend,1,1,1,1 -access_bus_presence,bus.presence,bus.model_bus_presence,group_backend,1,1,1,1 -access_mail_channel_member_user,mail.channel.member.user,mail.model_mail_channel_member,group_backend,1,1,1,0 -access_mail_channel_user,mail.group.user,mail.model_mail_channel,group_backend,1,1,1,0 -access_mail_notification_user,mail.notification.user,mail.model_mail_notification,group_backend,1,1,1,0 -access_mail_activity_user,mail.activity.user,mail.model_mail_activity,group_backend,1,1,1,1 -access_mail_activity_type_user,mail.activity.type.user,mail.model_mail_activity_type,group_backend,1,0,0,0 -access_ir_attachment_group_user,ir_attachment group_user,base.model_ir_attachment,group_backend,1,0,0,0 -access_mail_followers_user,mail.followers.user,mail.model_mail_followers,group_backend,1,0,0,0 +res_users_backend,backend user res.users,base.model_res_users,group_backend,1,0,0,0 +res_partner_backend,backend user res.partner,base.model_res_partner,group_backend,1,0,0,0 +ir_ui_menu_backend,backend user ir.ui.menu,base.model_ir_ui_menu,group_backend,1,0,0,0 +ir_filter_backend,backend user ir.filters,base.model_ir_filters,group_backend,1,1,1,1 +bus_presence_backend,backend user bus.presence,bus.model_bus_presence,group_backend,1,1,1,1 +mail_channel_member_backend,backend user mail.channel.member,mail.model_mail_channel_member,group_backend,1,1,1,0 +mail_channel_backend,backend user mail.group,mail.model_mail_channel,group_backend,1,1,1,0 +mail_notification_backend,backend user mail.notification,mail.model_mail_notification,group_backend,1,1,1,0 +mail_activity_backend,backend user mail.activity,mail.model_mail_activity,group_backend,1,1,1,1 +mail_activity_type_backend,backend user mail.activity.type,mail.model_mail_activity_type,group_backend,1,0,0,0 +ir_attachment_group_backend,backend user ir.attachment,base.model_ir_attachment,group_backend,1,0,0,0 +mail_followers_backend,backend user mail.followers,mail.model_mail_followers,group_backend,1,0,0,0