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

[IMP] in ir_model_data.get_object(), rename parameter 'check' into 'raise_exception' 

bzr revid: rco@openerp.com-20140127151726-if92mwiu3xawr8ge
This commit is contained in:
Raphael Collet 2014-01-27 16:17:26 +01:00
parent 0ffa561bbf
commit 9518e6c323
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openerp/addons/base/ir/ir_model.py
View File

@ -884,24 +884,24 @@ class ir_model_data(osv.osv):
raise ValueError('Not enough access rights on the external ID: %s.%s' % (module, xml_id))
return model, False
def get_object(self, cr, uid, module, xml_id, context=None, check=True):
def get_object(self, cr, uid, module, xml_id, context=None, raise_exception=True):
""" Returns a browsable record for the given module name and xml_id.
If not found, raise a ValueError or return a browse_null, depending
on the value of `check`.
on the value of `raise_exception`.
:param check: when true, check whether record exists and raise a
ValueError if it does not; otherwise return a browse_null or
non-existing record.
:param raise_exception: when true, check whether record exists and
raise a ValueError if it does not; otherwise return a browse_null
or non-existing record.
"""
try:
res_model, res_id = self.get_object_reference(cr, uid, module, xml_id)
record = self.pool[res_model].browse(cr, uid, res_id, context=context)
except ValueError:
if check:
if raise_exception:
raise
return browse_null()
if check and not record.exists():
if raise_exception and not record.exists():
raise ValueError('No record found for unique ID %s.%s. It may have been deleted.' % (module, xml_id))
return record

2
openerp/addons/base/res/res_users.py
View File

@ -685,7 +685,7 @@ class groups_view(osv.osv):
# and introduces the reified group fields
# we have to try-catch this, because at first init the view does not exist
# but we are already creating some basic groups
view = self.pool['ir.model.data'].get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context=context, check=False)
view = self.pool['ir.model.data'].get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context=context, raise_exception=False)
if view and view.exists() and view._table_name == 'ir.ui.view':
xml1, xml2 = [], []
xml1.append(E.separator(string=_('Application'), colspan="4"))