[IMP] portal: remove other_group_ids, which is superseded by implied_ids

bzr revid: rco@openerp.com-20110802135030-wh6nfwzfoy235baf

2 files changed, 19 insertions, 29 deletions

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 78483d6a1f1..1c7f84c363a 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -37,10 +37,6 @@ class portal(osv.osv):
         'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
             string='Group',
             help='The group extended by this portal'),
-        'other_group_ids': fields.many2many('res.groups',
-            'portal_group_rel', 'portal_id', 'group_id',
-            string='Other User Groups',
-            help="Those groups are assigned to the portal's users"),
         'url': fields.char('URL', size=64,
             help="The url where portal users can connect to the server"),
         'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
@@ -70,8 +66,8 @@ class portal(osv.osv):
         portal_id = super(portal, self).create(cr, uid, values, context)
         
         # assign menu action and widgets to users
-        if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'):
-            self._assign_menu_and_groups(cr, uid, [portal_id], context)
+        if values.get('users') or values.get('menu_action_id'):
+            self._assign_menu(cr, uid, [portal_id], context)
         if values.get('users') or values.get('widget_ids'):
             self._assign_widgets(cr, uid, [portal_id], context)
         
@@ -83,8 +79,8 @@ class portal(osv.osv):
         super(portal, self).write(cr, uid, ids, values, context)
         
         # assign menu action and widgets to users
-        if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'):
-            self._assign_menu_and_groups(cr, uid, ids, context)
+        if values.get('users') or values.get('menu_action_id'):
+            self._assign_menu(cr, uid, ids, context)
         if values.get('users') or values.get('widget_ids'):
             self._assign_widgets(cr, uid, ids, context)
         
@@ -117,18 +113,15 @@ class portal(osv.osv):
         
         return True
 
-    def _assign_menu_and_groups(self, cr, uid, ids, context=None):
-        """ assign portal menu and other groups to users of portals (ids) """
+    def _assign_menu(self, cr, uid, ids, context=None):
+        """ assign portal menu to users of portals (ids) """
         user_obj = self.pool.get('res.users')
         for p in self.browse(cr, uid, ids, context):
-            # user groups = portal group + other groups
-            group_ids = [p.group_id.id] + [g.id for g in p.other_group_ids]
-            user_values = {'groups_id': [(6, 0, group_ids)]}
             # user menu action = portal menu action if set in portal
             if p.menu_action_id:
-                user_values['menu_id'] = p.menu_action_id.id
-            user_ids = [u.id for u in p.users if u.id != 1]
-            user_obj.write(cr, uid, user_ids, user_values, context)
+                user_ids = [u.id for u in p.users if u.id != 1]
+                user_values = {'menu_id': p.menu_action_id.id}
+                user_obj.write(cr, uid, user_ids, user_values, context)
 
     def _assign_widgets(self, cr, uid, ids, context=None):
         """ assign portal widgets to users of portals (ids) """
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index d43c6115ad6..a6a780fdf16 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -43,11 +43,20 @@ the portal's users.
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <group colspan="2" col="2">
+                        <group colspan="4" col="2">
                             <separator string="Website" colspan="2"/>
                             <field name="url" widget="url"/>
                         </group>
                         <group colspan="2" col="2">
+                            <separator string="Widgets assigned to Users" colspan="2"/>
+                            <field name="widget_ids" nolabel="1" colspan="2">
+                                <tree string="Widgets" editable="bottom">
+                                    <field name="sequence"/>
+                                    <field name="widget_id"/>
+                                </tree>
+                            </field>
+                        </group>
+                        <group colspan="2" col="2">
                             <separator string="Portal Menu" colspan="2"/>
                             <field name="override_menu"/>
                             <field name="parent_menu_id"
@@ -56,18 +65,6 @@ the portal's users.
                             <button name="do_create_menu" type="object"
                                 string="Create Parent Menu"/>
                         </group>
-                        <separator string="Other Groups assigned to Users" colspan="2"/>
-                        <separator string="Widgets assigned to Users" colspan="2"/>
-                        <!-- load group_id in order to exclude it from other_group_ids -->
-                        <field name="group_id" invisible="1"/>
-                        <field name="other_group_ids" nolabel="1" colspan="2"
-                            domain="[('id', '!=', group_id)]"/>
-                        <field name="widget_ids" nolabel="1" colspan="2">
-                            <tree string="Widgets" editable="bottom">
-                                <field name="sequence"/>
-                                <field name="widget_id"/>
-                            </tree>
-                        </field>
                     </page>
                 </page>
             </field>