Merge lp:~kangol/openobject-server/6.0-correct-global-irrule into lp:openobject-server/6.0

[Christophe Simonis (OpenERP)]

=== modified file 'bin/addons/base/ir/ir_rule.py'
--- bin/addons/base/ir/ir_rule.py	2011-03-02 11:08:16 +0000
+++ bin/addons/base/ir/ir_rule.py	2011-05-09 10:31:04 +0000
@@ -51,13 +51,26 @@
                 res[rule.id] = False
         return res
 
+    def _store_get_rule_ids(self, cr, uid, ids, context=None):
+        groups = self.pool.get('res.groups')
+        result = set()
+        for g in groups.browse(cr, uid, ids, context):
+            result.update(r.id for r in g.rule_groups)
+        return result
+        
+
     def _check_model_obj(self, cr, uid, ids, context=None):
         return not any(isinstance(self.pool.get(rule.model_id.model), osv.osv_memory) for rule in self.browse(cr, uid, ids, context))
 
     _columns = {
         'name': fields.char('Name', size=128, select=1),
         'model_id': fields.many2one('ir.model', 'Object',select=1, required=True),
-        'global': fields.function(_get_value, method=True, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
+        'global': fields.function(_get_value, method=True, string='Global', type='boolean',
+                                  store={
+                                        _name: (lambda s,c,u,i,ctx=None: i, ['groups'], 10),
+                                        'res.groups': (_store_get_rule_ids, ['rule_groups'], 10),
+                                  },
+                                  help="If no group is specified the rule is global and applied to everyone"),
         'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
         'domain_force': fields.text('Domain'),
         'domain': fields.function(_domain_force_get, method=True, string='Domain', type='text'),
 
=== modified file 'bin/addons/base/res/res_user.py'
--- bin/addons/base/res/res_user.py	2011-05-06 09:37:04 +0000
+++ bin/addons/base/res/res_user.py	2011-05-09 10:31:04 +0000
@@ -38,7 +38,7 @@
         'name': fields.char('Group Name', size=64, required=True),
         'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
         'rule_groups': fields.many2many('ir.rule', 'rule_group_rel',
-            'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]),
+            'group_id', 'rule_group_id', 'Rules'),
         'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
         'comment' : fields.text('Comment',size=250),
     }