odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] base: completely remove default value for action_id of res.users + cleanup + tooltips 

bzr revid: odo@openerp.com-20101001163717-bf1xnz6qm76y4s7h
This commit is contained in:
Olivier Dony 2010-10-01 18:37:17 +02:00
parent cd02d15c08
commit 037d12f3fa
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/addons/base/base.sql
View File

@ -148,7 +148,6 @@ CREATE TABLE res_users (
context_lang varchar(64) default '',
-- No FK references below, will be added later by ORM
-- (when the destination rows exist)
action_id int,
company_id int,
primary key(id)
);
@ -345,7 +344,7 @@ CREATE TABLE ir_model_data (
-- Users
---------------------------------
insert into res_users (id,login,password,name,action_id,active,company_id) values (1,'admin','admin','Administrator',NULL,True,1);
insert into res_users (id,login,password,name,active,company_id) values (1,'admin','admin','Administrator',True,1);
insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
-- Compatibility purpose, to remove V6.0

2
bin/addons/base/base_data.xml
View File

@ -1053,8 +1053,6 @@
<field name="address_id" ref="main_address"/>
<field name="company_id" ref="main_company"/>
<field name="company_ids" eval="[(4, ref('main_company'))]"/>
<field name="action_id" ref="action_menu_admin"/>
<field name="menu_id" ref="action_menu_admin"/>
</record>
<record id="main_partner" model="res.partner">

2
bin/addons/base/base_demo.xml
View File

@ -6,8 +6,6 @@
<field name="password">demo</field>
<field name="name">Demo User</field>
<field name="signature">Mr Demo</field>
<field name="action_id" ref="action_menu_admin"/>
<field name="menu_id" ref="action_menu_admin"/>
<field name="address_id" ref="main_address"/>
<field name="company_id" ref="main_company"/>
<field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>

17
bin/addons/base/res/res_user.py
View File

@ -242,8 +242,8 @@ class users(osv.osv):
'signature': fields.text('Signature', size=64),
'address_id': fields.many2one('res.partner.address', 'Company Address'),
'active': fields.boolean('Active'),
'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
@ -288,7 +288,6 @@ class users(osv.osv):
result = override_password(result)
else:
result = map(override_password, result)
return result
@ -319,10 +318,6 @@ class users(osv.osv):
self.__admin_ids[cr.dbname] = ir_model_data_obj.read(cr, 1, [mdid], ['res_id'])[0]['res_id']
return self.__admin_ids[cr.dbname]
def _get_action(self,cr, uid, context={}):
ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
return ids and ids[0] or False
def _get_company(self,cr, uid, context=None, uid2=False):
if not uid2:
uid2 = uid
@ -336,12 +331,12 @@ class users(osv.osv):
return [c]
return False
def _get_menu(self,cr, uid, context={}):
ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
def _get_menu(self,cr, uid, context=None):
ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')], context=context)
return ids and ids[0] or False
def _get_group(self,cr, uid, context={}):
ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')])
def _get_group(self,cr, uid, context=None):
ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')], context=context)
return ids or False
_defaults = {