diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py index d7356fc9ce5..f5e3c9ff452 100644 --- a/addons/portal/__openerp__.py +++ b/addons/portal/__openerp__.py @@ -44,7 +44,6 @@ very handy when used in combination with the module 'share'. """, 'website': 'http://www.openerp.com', 'data': [ - 'security/portal_security.xml', 'security/ir.model.access.csv', 'portal_data.xml', 'portal_view.xml', diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml index eb06ca656d6..42447afdfd5 100644 --- a/addons/portal/portal_data.xml +++ b/addons/portal/portal_data.xml @@ -2,6 +2,12 @@ + + + Portal Member + Portal members can access information through the portal menu. Also, they are chrooted in this specific menu. + + Portal diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index fd15a842405..924f74565cd 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -84,7 +84,7 @@ - + diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv index 56b3ae5f269..29c43bb4815 100644 --- a/addons/portal/security/ir.model.access.csv +++ b/addons/portal/security/ir.model.access.csv @@ -1,8 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_all,access.portal.all,model_res_portal,,1,0,0,0 access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0 -access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1 -access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1 access_mail_message,mail.message,mail.model_mail_message,group_portal_member,1,0,1,1 access_mail_message_all,mail.message.all,mail.model_mail_message,group_portal_member,1,0,0,0 access_mail_thread,mail.thread,mail.model_mail_thread,group_portal_member,1,0,0,0 diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml deleted file mode 100644 index 4a493204d67..00000000000 --- a/addons/portal/security/portal_security.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - Portal Member - Portal members can access information through the portal menu. Also, they are chrooted in this specific menu. - - - - Portal - - 25 - - - - - Officer - Portal officers can create new portal users with the portal wizard. - - - - - Manager - Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users. - - - - - - - diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml index 0cf84646bab..7a81def67b0 100644 --- a/addons/portal/wizard/portal_wizard_view.xml +++ b/addons/portal/wizard/portal_wizard_view.xml @@ -8,7 +8,7 @@ res_model="res.portal.wizard" view_type="form" view_mode="form" key2="client_action_multi" target="new" - groups="group_portal_officer"/> + groups="base.group_partner_manager"/> diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py index ca950a61b08..e56e7517348 100644 --- a/addons/portal/wizard/share_wizard.py +++ b/addons/portal/wizard/share_wizard.py @@ -44,9 +44,6 @@ class share_wizard_portal(osv.TransientModel): 'group_ids': fields.many2many('res.groups', 'share_wizard_res_group_rel', 'share_id', 'group_id', 'Existing groups', domain=[('share', '=', False)]), } - def is_portal_manager(self, cr, uid, context=None): - return self.has_group(cr, uid, module='portal', group_xml_id='group_portal_manager', context=context) - def _check_preconditions(self, cr, uid, wizard_data, context=None): if wizard_data.user_type == 'existing': self._assert(wizard_data.user_ids, diff --git a/addons/portal/wizard/share_wizard_view.xml b/addons/portal/wizard/share_wizard_view.xml index 72ae857eaaf..065a7aa317e 100644 --- a/addons/portal/wizard/share_wizard_view.xml +++ b/addons/portal/wizard/share_wizard_view.xml @@ -36,12 +36,12 @@ - + - - + +