KERNEL,BASE: add menu to user

bzr revid: ced-4ba041841f09238f24b0ea7e3b08db41a92ec8ea
This commit is contained in:
ced 2007-05-30 13:19:32 +00:00
parent b16ca35ae4
commit f56df5f4ec
6 changed files with 34 additions and 2 deletions

View File

@ -1298,6 +1298,8 @@
<field name="name">Administrator</field>
<field name="signature">Administrator</field>
<field name="action_id" ref="action_menu_admin"/>
<field name="menu_id" ref="action_menu_admin"/>
<field name="menu_id" ref="action_menu_admin"/>
<field name="address_id" ref="main_address"/>
<field name="groups_id" eval="[(6,0,[group_admin])]"/>
<field name="company_id" ref="main_company"/>

View File

@ -7,6 +7,7 @@
<field name="name">Demo User</field>
<field name="signature">Fabien Pinckaers</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"/>
</record>

View File

@ -116,6 +116,7 @@
<field name="address_id"/>
<field name="company_id" required="1"/>
<field name="action_id" domain="[('usage','=','menu')]" required="True"/>
<field name="menu_id" domain="[('usage','=','menu')]" required="True"/>
<field name="signature" colspan="4"/>
</page>
<page string="Security">
@ -181,8 +182,20 @@
<field name="res_model">res.users</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="base.view_users_tree"/>
</record>
<record model="ir.actions.act_window.view" id="open_module_users_list_view1">
<field name="sequence" eval="10"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_users_tree"/>
<field name="act_window_id" ref="open_module_users_list"/>
</record>
<record model="ir.actions.act_window.view" id="open_module_users_list_view2">
<field name="sequence" eval="20"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_users_form"/>
<field name="act_window_id" ref="open_module_users_list"/>
</record>
<menuitem name="Administration/Configuration/User/Define Users" action="open_module_users_list" sequence="1" id="menu_users_list"/>
</data>

View File

@ -372,6 +372,19 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_users_tree"/>
</record>
<record model="ir.actions.act_window.view" id="action_res_users_view1">
<field name="sequence" eval="10"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_users_tree"/>
<field name="act_window_id" ref="action_res_users"/>
</record>
<record model="ir.actions.act_window.view" id="action_res_users_view2">
<field name="sequence" eval="20"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_users_form"/>
<field name="act_window_id" ref="action_res_users"/>
</record>
<menuitem name="Administration/Users/Users" action="action_res_users" id="menu_action_res_users"/>
<record model="ir.actions.act_window" id="action_res_users_my">

View File

@ -89,6 +89,7 @@ class users(osv.osv):
'address_id': fields.many2one('res.partner.address', 'Address'),
'active': fields.boolean('Active'),
'action_id': fields.many2one('ir.actions.actions', 'Action'),
'menu_id': fields.many2one('ir.actions.actions', 'Menu'),
'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'),
'company_id': fields.many2one('res.company', 'Company'),

View File

@ -383,7 +383,9 @@ class orm(object):
ref = self.pool.get(f._obj)._table
except AttributeError:
ref = f._obj.replace('.','_')
cr.execute("ALTER TABLE %s ADD FOREIGN KEY (%s) REFERENCES %s ON DELETE %s" % (self._table, k, ref, f.ondelete))
# ir_actions is inherited so foreign key doesn't work on it
if ref <> 'ir_actions':
cr.execute("ALTER TABLE %s ADD FOREIGN KEY (%s) REFERENCES %s ON DELETE %s" % (self._table, k, ref, f.ondelete))
if f.select:
cr.execute("CREATE INDEX %s_%s_index ON %s (%s)" % (self._table, k, self._table, k))
if f.required: