[REM] shortcuts, deprecated by bookmarks
bzr revid: al@openerp.com-20131006132424-bpd8w0zzuf42s55l
This commit is contained in:
parent
097dc15ded
commit
31a8dc36e5
|
@ -76,7 +76,6 @@ The kernel of OpenERP, needed for all installation.
|
||||||
'res/res_lang_view.xml',
|
'res/res_lang_view.xml',
|
||||||
'res/res_partner_report.xml',
|
'res/res_partner_report.xml',
|
||||||
'res/res_partner_view.xml',
|
'res/res_partner_view.xml',
|
||||||
'res/res_partner_shortcut_data.xml',
|
|
||||||
'res/res_bank_view.xml',
|
'res/res_bank_view.xml',
|
||||||
'res/res_country_view.xml',
|
'res/res_country_view.xml',
|
||||||
'res/res_currency_view.xml',
|
'res/res_currency_view.xml',
|
||||||
|
|
|
@ -32,14 +32,6 @@ from openerp import SUPERUSER_ID
|
||||||
|
|
||||||
MENU_ITEM_SEPARATOR = "/"
|
MENU_ITEM_SEPARATOR = "/"
|
||||||
|
|
||||||
def one_in(setA, setB):
|
|
||||||
"""Check the presence of an element of setA in setB
|
|
||||||
"""
|
|
||||||
for x in setA:
|
|
||||||
if x in setB:
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
class ir_ui_menu(osv.osv):
|
class ir_ui_menu(osv.osv):
|
||||||
_name = 'ir.ui.menu'
|
_name = 'ir.ui.menu'
|
||||||
|
|
||||||
|
|
|
@ -305,41 +305,5 @@ class view(osv.osv):
|
||||||
ids = map(itemgetter(0), cr.fetchall())
|
ids = map(itemgetter(0), cr.fetchall())
|
||||||
return self._check_xml(cr, uid, ids)
|
return self._check_xml(cr, uid, ids)
|
||||||
|
|
||||||
|
|
||||||
class view_sc(osv.osv):
|
|
||||||
_name = 'ir.ui.view_sc'
|
|
||||||
_columns = {
|
|
||||||
'name': fields.char('Shortcut Name', size=64), # Kept for backwards compatibility only - resource name used instead (translatable)
|
|
||||||
'res_id': fields.integer('Resource Ref.', help="Reference of the target resource, whose model/table depends on the 'Resource Name' field."),
|
|
||||||
'sequence': fields.integer('Sequence'),
|
|
||||||
'user_id': fields.many2one('res.users', 'User Ref.', required=True, ondelete='cascade', select=True),
|
|
||||||
'resource': fields.char('Resource Name', size=64, required=True, select=True)
|
|
||||||
}
|
|
||||||
|
|
||||||
def _auto_init(self, cr, context=None):
|
|
||||||
super(view_sc, self)._auto_init(cr, context)
|
|
||||||
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'ir_ui_view_sc_user_id_resource\'')
|
|
||||||
if not cr.fetchone():
|
|
||||||
cr.execute('CREATE INDEX ir_ui_view_sc_user_id_resource ON ir_ui_view_sc (user_id, resource)')
|
|
||||||
|
|
||||||
def get_sc(self, cr, uid, user_id, model='ir.ui.menu', context=None):
|
|
||||||
ids = self.search(cr, uid, [('user_id','=',user_id),('resource','=',model)], context=context)
|
|
||||||
results = self.read(cr, uid, ids, ['res_id'], context=context)
|
|
||||||
name_map = dict(self.pool[model].name_get(cr, uid, [x['res_id'] for x in results], context=context))
|
|
||||||
# Make sure to return only shortcuts pointing to exisintg menu items.
|
|
||||||
filtered_results = filter(lambda result: result['res_id'] in name_map, results)
|
|
||||||
for result in filtered_results:
|
|
||||||
result.update(name=name_map[result['res_id']])
|
|
||||||
return filtered_results
|
|
||||||
|
|
||||||
_order = 'sequence,name'
|
|
||||||
_defaults = {
|
|
||||||
'resource': 'ir.ui.menu',
|
|
||||||
'user_id': lambda obj, cr, uid, context: uid,
|
|
||||||
}
|
|
||||||
_sql_constraints = [
|
|
||||||
('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'),
|
|
||||||
]
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
||||||
|
|
|
@ -114,27 +114,5 @@
|
||||||
</record>
|
</record>
|
||||||
<menuitem id="menu_action_ui_view_custom" action="action_ui_view_custom" parent="base.next_id_2" sequence="3"/>
|
<menuitem id="menu_action_ui_view_custom" action="action_ui_view_custom" parent="base.next_id_2" sequence="3"/>
|
||||||
|
|
||||||
<!-- Shortcuts -->
|
|
||||||
<record id="shortcut_form" model="ir.ui.view">
|
|
||||||
<field name="model">ir.ui.view_sc</field>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<form string="Shortcut" version="7.0">
|
|
||||||
<group col="4">
|
|
||||||
<field name="name"/>
|
|
||||||
<field name="sequence"/>
|
|
||||||
</group>
|
|
||||||
</form>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
<record id="shortcut_tree" model="ir.ui.view">
|
|
||||||
<field name="model">ir.ui.view_sc</field>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<tree string="Shortcut">
|
|
||||||
<field name="name"/>
|
|
||||||
<field name="sequence"/>
|
|
||||||
</tree>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<openerp>
|
|
||||||
<data noupdate="1">
|
|
||||||
|
|
||||||
<record id="ir_ui_view_sc_partner0" model="ir.ui.view_sc">
|
|
||||||
<field name="name">Customers</field>
|
|
||||||
<field name="resource">ir.ui.menu</field>
|
|
||||||
<field name="user_id" ref="base.user_root"/>
|
|
||||||
<field name="res_id" ref="menu_partner_form"/>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
</data>
|
|
||||||
</openerp>
|
|
|
@ -40,7 +40,6 @@
|
||||||
"access_ir_ui_view_group_user","ir_ui_view group_user","model_ir_ui_view",,1,0,0,0
|
"access_ir_ui_view_group_user","ir_ui_view group_user","model_ir_ui_view",,1,0,0,0
|
||||||
"access_ir_ui_view_group_system","ir_ui_view group_system","model_ir_ui_view","group_system",1,1,1,1
|
"access_ir_ui_view_group_system","ir_ui_view group_system","model_ir_ui_view","group_system",1,1,1,1
|
||||||
"access_ir_ui_view_custom_group_user","ir_ui_view_custom_group_user","model_ir_ui_view_custom",,1,1,1,1
|
"access_ir_ui_view_custom_group_user","ir_ui_view_custom_group_user","model_ir_ui_view_custom",,1,1,1,1
|
||||||
"access_ir_ui_view_sc_group_user","ir_ui_view_sc group_user","model_ir_ui_view_sc",,1,1,1,1
|
|
||||||
"access_ir_values_group_all","ir_values group_all","model_ir_values",,1,1,1,1
|
"access_ir_values_group_all","ir_values group_all","model_ir_values",,1,1,1,1
|
||||||
"access_res_company_group_erp_manager","res_company group_erp_manager","model_res_company","group_erp_manager",1,1,1,1
|
"access_res_company_group_erp_manager","res_company group_erp_manager","model_res_company","group_erp_manager",1,1,1,1
|
||||||
"access_res_company_group_user","res_company group_user","model_res_company",,1,0,0,0
|
"access_res_company_group_user","res_company group_user","model_res_company",,1,0,0,0
|
||||||
|
|
|
Loading…
Reference in New Issue