changeset 294397241c5e in modules/production_work:default
details:
https://hg.tryton.org/modules/production_work?cmd=changeset&node=294397241c5e
description:
Check rule only if _check_access is set and enforce companies rule
issue4080
review343891009
diffstat:
tests/test_production_work.py | 4 ++--
work.xml | 30 +++++++++++++++---------------
2 files changed, 17 insertions(+), 17 deletions(-)
diffs (86 lines):
diff -r 46cd95e3f4e1 -r 294397241c5e tests/test_production_work.py
--- a/tests/test_production_work.py Fri Mar 05 15:49:19 2021 +0100
+++ b/tests/test_production_work.py Sat Apr 10 23:46:23 2021 +0200
@@ -7,10 +7,10 @@
from trytond.tests.test_tryton import doctest_teardown
from trytond.tests.test_tryton import doctest_checker
-from trytond.modules.company.tests import CompanyMultiValueTestMixin
+from trytond.modules.company.tests import CompanyTestMixin
-class ProductionWorkTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
+class ProductionWorkTestCase(CompanyTestMixin, ModuleTestCase):
'Test Production Work module'
module = 'production_work'
diff -r 46cd95e3f4e1 -r 294397241c5e work.xml
--- a/work.xml Fri Mar 05 15:49:19 2021 +0100
+++ b/work.xml Sat Apr 10 23:46:23 2021 +0200
@@ -94,17 +94,17 @@
<field name="perm_delete" eval="True"/>
</record>
- <record model="ir.rule.group" id="rule_group_work_center">
- <field name="name">User in company</field>
+ <record model="ir.rule.group" id="rule_group_work_center_companies">
+ <field name="name">User in companies</field>
<field name="model"
search="[('model', '=', 'production.work.center')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_work_center">
+ <record model="ir.rule" id="rule_work_center_companies">
<field name="domain"
- eval="[('company', '=', Eval('user', {}).get('company',
None))]"
+ eval="[('company', 'in', Eval('companies', []))]"
pyson="1"/>
- <field name="rule_group" ref="rule_group_work_center"/>
+ <field name="rule_group" ref="rule_group_work_center_companies"/>
</record>
<record model="ir.ui.view" id="work_center_category_view_list">
@@ -263,16 +263,16 @@
<field name="model" search="[('model', '=', 'production.work')]"/>
</record>
- <record model="ir.rule.group" id="rule_group_work">
- <field name="name">User in company</field>
+ <record model="ir.rule.group" id="rule_group_work_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=', 'production.work')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_work">
+ <record model="ir.rule" id="rule_work_companies">
<field name="domain"
- eval="[('company', '=', Eval('user', {}).get('company',
None))]"
+ eval="[('company', 'in', Eval('companies', []))]"
pyson="1"/>
- <field name="rule_group" ref="rule_group_work"/>
+ <field name="rule_group" ref="rule_group_work_companies"/>
</record>
<record model="ir.ui.view" id="work_cycle_view_list">
@@ -324,16 +324,16 @@
search="[('model', '=', 'production.work.cycle')]"/>
</record>
- <record model="ir.rule.group" id="rule_group_work_cycle">
- <field name="name">User in company</field>
+ <record model="ir.rule.group" id="rule_group_work_cycle_companies">
+ <field name="name">User in companies</field>
<field name="model" search="[('model', '=',
'production.work.cycle')]"/>
<field name="global_p" eval="True"/>
</record>
- <record model="ir.rule" id="rule_work_cycle">
+ <record model="ir.rule" id="rule_work_cycle_companies">
<field name="domain"
- eval="[('work.company', '=', Eval('user', {}).get('company',
None))]"
+ eval="[('work.company', 'in', Eval('companies', []))]"
pyson="1"/>
- <field name="rule_group" ref="rule_group_work_cycle"/>
+ <field name="rule_group" ref="rule_group_work_cycle_companies"/>
</record>
</data>
