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

[FIX] ir_rule: forgot to add the id child_of user.company_id rule. 

Also, changed the context={} to context=None.

bzr revid: vmt@openerp.com-20110302110816-09nslq9snkd0rp4r
This commit is contained in:
Vo Minh Thu 2011-03-02 12:08:16 +01:00
parent a5bb7c001f
commit c36f481194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/addons/base/ir/ir_rule.py
View File

@ -31,7 +31,7 @@ class ir_rule(osv.osv):
_order = 'name'
_MODES = ['read', 'write', 'create', 'unlink']
def _domain_force_get(self, cr, uid, ids, field_name, arg, context={}):
def _domain_force_get(self, cr, uid, ids, field_name, arg, context=None):
res = {}
for rule in self.browse(cr, uid, ids, context):
if rule.domain_force:
@ -42,7 +42,7 @@ class ir_rule(osv.osv):
res[rule.id] = []
return res
def _get_value(self, cr, uid, ids, field_name, arg, context={}):
def _get_value(self, cr, uid, ids, field_name, arg, context=None):
res = {}
for rule in self.browse(cr, uid, ids, context):
if not rule.groups:
@ -151,7 +151,7 @@ class ir_rule(osv.osv):
[clear(model, mode) for model in models for mode in self._MODES]
def domain_get(self, cr, uid, model_name, mode='read', context={}):
def domain_get(self, cr, uid, model_name, mode='read', context=None):
dom = self._compute_domain(cr, uid, model_name, mode=mode)
if dom:
# _where_calc is called as superuser. This means that rules can
@ -175,8 +175,6 @@ class ir_rule(osv.osv):
return res
def write(self, cr, uid, ids, vals, context=None):
if not context:
context={}
res = super(ir_rule, self).write(cr, uid, ids, vals, context=context)
# Restart the cache on the _compute_domain method
self._compute_domain.clear_cache(cr.dbname)

2
bin/addons/base/res/res_security.xml
View File

@ -21,7 +21,7 @@
<field model="ir.model" name="model_id" ref="model_res_company"/>
<field eval="True" name="global"/>
<!-- TODO: review this <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field> -->
<field name="domain_force">[]</field>
<field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
</record>
<!-- Record Rule For User -->