[IMP] merged the python classes defining res.groups
bzr revid: rco@openerp.com-20110726103100-6ibtqsfnim3unpg3
This commit is contained in:
parent
3b9b028c1e
commit
e0f401bae4
|
@ -36,6 +36,7 @@ class groups(osv.osv):
|
||||||
_description = "Access Groups"
|
_description = "Access Groups"
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Group Name', size=64, required=True),
|
'name': fields.char('Group Name', size=64, required=True),
|
||||||
|
'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
|
||||||
'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
|
'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
|
||||||
'rule_groups': fields.many2many('ir.rule', 'rule_group_rel',
|
'rule_groups': fields.many2many('ir.rule', 'rule_group_rel',
|
||||||
'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]),
|
'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]),
|
||||||
|
@ -76,6 +77,21 @@ class groups(osv.osv):
|
||||||
aid.write({'groups_id': [(4, gid)]})
|
aid.write({'groups_id': [(4, gid)]})
|
||||||
return gid
|
return gid
|
||||||
|
|
||||||
|
def unlink(self, cr, uid, ids, context=None):
|
||||||
|
group_users = []
|
||||||
|
for record in self.read(cr, uid, ids, ['users'], context=context):
|
||||||
|
if record['users']:
|
||||||
|
group_users.extend(record['users'])
|
||||||
|
if group_users:
|
||||||
|
user_names = [user.name for user in self.pool.get('res.users').browse(cr, uid, group_users, context=context)]
|
||||||
|
user_names = list(set(user_names))
|
||||||
|
if len(user_names) >= 5:
|
||||||
|
user_names = user_names[:5] + ['...']
|
||||||
|
raise osv.except_osv(_('Warning !'),
|
||||||
|
_('Group(s) cannot be deleted, because some user(s) still belong to them: %s !') % \
|
||||||
|
', '.join(user_names))
|
||||||
|
return super(groups, self).unlink(cr, uid, ids, context=context)
|
||||||
|
|
||||||
def get_extended_interface_group(self, cr, uid, context=None):
|
def get_extended_interface_group(self, cr, uid, context=None):
|
||||||
data_obj = self.pool.get('ir.model.data')
|
data_obj = self.pool.get('ir.model.data')
|
||||||
extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')
|
extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')
|
||||||
|
@ -510,30 +526,6 @@ class users(osv.osv):
|
||||||
|
|
||||||
users()
|
users()
|
||||||
|
|
||||||
class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ?
|
|
||||||
_inherit = 'res.groups'
|
|
||||||
_columns = {
|
|
||||||
'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
|
|
||||||
}
|
|
||||||
|
|
||||||
def unlink(self, cr, uid, ids, context=None):
|
|
||||||
group_users = []
|
|
||||||
for record in self.read(cr, uid, ids, ['users'], context=context):
|
|
||||||
if record['users']:
|
|
||||||
group_users.extend(record['users'])
|
|
||||||
|
|
||||||
if group_users:
|
|
||||||
user_names = [user.name for user in self.pool.get('res.users').browse(cr, uid, group_users, context=context)]
|
|
||||||
user_names = list(set(user_names))
|
|
||||||
if len(user_names) >= 5:
|
|
||||||
user_names = user_names[:5] + ['...']
|
|
||||||
raise osv.except_osv(_('Warning !'),
|
|
||||||
_('Group(s) cannot be deleted, because some user(s) still belong to them: %s !') % \
|
|
||||||
', '.join(user_names))
|
|
||||||
return super(groups2, self).unlink(cr, uid, ids, context=context)
|
|
||||||
|
|
||||||
groups2()
|
|
||||||
|
|
||||||
class res_config_view(osv.osv_memory):
|
class res_config_view(osv.osv_memory):
|
||||||
_name = 'res.config.view'
|
_name = 'res.config.view'
|
||||||
_inherit = 'res.config'
|
_inherit = 'res.config'
|
||||||
|
|
Loading…
Reference in New Issue