pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] orm.fields_get: renamed read_access parameter to write_access, reflecting its real usage. Also cleaned up some mess leftover by commit 1338 in orm.field_get_keys() + other cleanup

Browse Source 
bzr revid: odo@openerp.com-20100712141513-akwx4gcujoboia1y
This commit is contained in:
Olivier Dony
2010-07-12 16:15:13 +02:00
parent 655c5c3dc5
commit a967c6e21f
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/ir/ir_model.py
+1 -1
View File
@@ -211,7 +211,7 @@ class ir_model_grid(osv.osv):
acc_obj.write(cr, uid, rules, vals2, context=context)
return True
def fields_get(self, cr, uid, fields=None, context=None, read_access=True):
def fields_get(self, cr, uid, fields=None, context=None):
result = super(ir_model_grid, self).fields_get(cr, uid, fields, context)
groups = self.pool.get('res.groups').search(cr, uid, [])
groups_br = self.pool.get('res.groups').browse(cr, uid, groups)
bin/addons/base/res/res_config.py
+2 -2
View File
@@ -382,13 +382,13 @@ class res_config_installer(osv.osv_memory):
self._already_installed(cr, uid, context=context)),
True))
def fields_get(self, cr, uid, fields=None, context=None, read_access=True):
def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
""" If an addon is already installed, set it to readonly as
res.config.installer doesn't handle uninstallations of already
installed addons
"""
fields = super(res_config_installer, self).fields_get(
cr, uid, fields, context, read_access)
cr, uid, fields, context, write_access)
for module in self._already_installed(cr, uid, context=context):
if module.name not in fields:
bin/osv/orm.py
+9 -12
View File
@@ -1070,22 +1070,19 @@ class orm_template(object):
def create(self, cr, user, vals, context=None):
raise NotImplementedError(_('The create method is not implemented on this object !'))
# returns the definition of each field in the object
# the optional fields parameter can limit the result to some fields
def fields_get_keys(self, cr, user, context=None, read_access=True):
if context is None:
context = {}
def fields_get_keys(self, cr, user, context=None):
res = self._columns.keys()
for parent in self._inherits:
res.extend(self.pool.get(parent).fields_get_keys(cr, user, fields, context))
res.extend(self.pool.get(parent).fields_get_keys(cr, user, context))
return res
def fields_get(self, cr, user, allfields=None, context=None, read_access=True):
# returns the definition of each field in the object
# the optional fields parameter can limit the result to some fields
def fields_get(self, cr, user, allfields=None, context=None, write_access=True):
if context is None:
context = {}
res = {}
translation_obj = self.pool.get('ir.translation')
model_access_obj = self.pool.get('ir.model.access')
for parent in self._inherits:
res.update(self.pool.get(parent).fields_get(cr, user, allfields, context))
@@ -1114,7 +1111,7 @@ class orm_template(object):
'change_default', 'translate', 'help', 'select', 'selectable'):
if getattr(self._columns[f], arg):
res[f][arg] = getattr(self._columns[f], arg)
if not read_access:
if not write_access:
res[f]['readonly'] = True
res[f]['states'] = {}
for arg in ('digits', 'invisible','filters'):
@@ -2775,9 +2772,9 @@ class orm(orm_template):
"""
ira = self.pool.get('ir.model.access')
read_access = ira.check(cr, user, self._name, 'write', raise_exception=False, context=context) or \
ira.check(cr, user, self._name, 'create', raise_exception=False, context=context)
return super(orm, self).fields_get(cr, user, fields, context, read_access)
write_access = ira.check(cr, user, self._name, 'write', raise_exception=False, context=context) or \
ira.check(cr, user, self._name, 'create', raise_exception=False, context=context)
return super(orm, self).fields_get(cr, user, fields, context, write_access)
def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
"""