Remove safe_eval

We convert all the fields that were storing python code into PYSON.
We add a pyson attribute on field tag to store PYSON value.

issue4416
review6971002
This commit is contained in:
Cédric Krier
2015-03-09 19:41:38 +01:00
parent 7d3ecacced
commit 0ee01769a5
+13 -7
View File
@@ -24,7 +24,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_company_tree">
<field name="name">Companies</field>
<field name="res_model">company.company</field>
<field name="domain">[('parent', '=', None)]</field>
<field name="domain" eval="[('parent', '=', None)]" pyson="1"/>
</record>
<record model="ir.action.act_window.view"
id="act_company_tree_view1">
@@ -102,11 +102,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_property1">
<field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
<field name="domain"
eval="[('company', '=', Eval('user', {}).get('company', None))]"
pyson="1"/>
<field name="rule_group" ref="rule_group_property"/>
</record>
<record model="ir.rule" id="rule_property2">
<field name="domain">[('company', '=', None)]</field>
<field name="domain" eval="[('company', '=', None)]" pyson="1"/>
<field name="rule_group" ref="rule_group_property"/>
</record>
@@ -126,11 +128,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_sequence1">
<field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
<field name="domain"
eval="[('company', '=', Eval('user', {}).get('company', None))]"
pyson="1"/>
<field name="rule_group" ref="rule_group_sequence"/>
</record>
<record model="ir.rule" id="rule_sequence2">
<field name="domain">[('company', '=', None)]</field>
<field name="domain" eval="[('company', '=', None)]" pyson="1"/>
<field name="rule_group" ref="rule_group_sequence"/>
</record>
@@ -139,11 +143,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_sequence_strict1">
<field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
<field name="domain"
eval="[('company', '=', Eval('user', {}).get('company', None))]"
pyson="1"/>
<field name="rule_group" ref="rule_group_sequence_strict"/>
</record>
<record model="ir.rule" id="rule_sequence_strict2">
<field name="domain">[('company', '=', None)]</field>
<field name="domain" eval="[('company', '=', None)]" pyson="1"/>
<field name="rule_group" ref="rule_group_sequence_strict"/>
</record>