Reviewers: ,
Please review this at http://codereview.tryton.org/482002/
Affected files:
M trytond/ir/action.py
M trytond/modules/timesheet/work.xml
Index: trytond/ir/action.py
===================================================================
--- a/trytond/ir/action.py
+++ b/trytond/ir/action.py
@@ -606,6 +606,9 @@
'invalid_domain': 'Invalid domain or search criteria!',
'invalid_context': 'Invalid context!',
})
+ self._rpc.update({
+ 'get': False,
+ })
def init(self, module_name):
cursor = Transaction().cursor
@@ -754,6 +757,14 @@
action_obj.delete(action_ids)
return res
+ def get(self, xml_id):
+ 'Get values from XML id'
+ pool = Pool()
+ model_data_obj = pool.get('ir.model.data')
+ action_obj = pool.get('ir.action')
+ action_id = model_data_obj.get_id(*xml_id.split('.'))
+ return action_obj.get_action_values(self._name, action_id)
+
ActionActWindow()
Index: trytond/modules/timesheet/work.xml
===================================================================
--- a/trytond/modules/timesheet/work.xml
+++ b/trytond/modules/timesheet/work.xml
@@ -140,7 +140,7 @@
<record model="ir.action.act_window" id="act_work_form2">
<field name="name">Hours per Work</field>
<field name="res_model">timesheet.work</field>
- <field name="domain" eval="'[(\'parent\', \'=\',
Get(Eval(\'_active_%s\', {}), \'id\', False))]' % ref('act_work_tree2')"/>
+ <field name="domain">[('parent', '=',
Get(Eval('timesheet.act_work_tree2', {}), 'id', False))]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_form2_view1">
@@ -157,10 +157,10 @@
<board string="Hours per Work">
<hpaned id="hours_per_work">
<child id="tree">
- <action name="%(act_work_tree2)s"/>
+ <action name="timesheet.act_work_tree2"/>
</child>
<child id="graph">
- <action name="%(act_work_form2)s"/>
+ <action name="timesheet.act_work_form2"/>
</child>
</hpaned>
</board>
--
[email protected] mailing list
