diff options
| author | rpa (Open ERP) <rpa@tinyerp.com> | 2010-08-23 12:13:09 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@tinyerp.com> | 2010-08-23 12:13:09 +0530 |
| commit | ae3ee2090d76b846f71ec6dbfbe8068a4afb4ba5 (patch) | |
| tree | 7c0d2a6f03b43f323c798995d76d2c434b65554b | |
| parent | 661c62a2a8d5f3294fa5d514bb1641cdbb1f0d66 (diff) | |
[FIX,IMP]: base: Improvement in search and form view of Configuration Wizards
bzr revid: rpa@tinyerp.com-20100823064309-2rpmfeqvwdupsozg
| -rw-r--r-- | bin/addons/base/ir/ir.xml | 29 | ||||
| -rw-r--r-- | bin/addons/base/ir/ir_actions.py | 5 |
2 files changed, 25 insertions, 9 deletions
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index f5422607d3f..fc252b649e0 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -1532,15 +1532,25 @@ <field name="type">form</field> <field name="arch" type="xml"> <form editable="bottom" string="Config Wizard Steps"> - <field name="sequence"/> - <field name="action_id" select="1"/> - <field name="restart"/> - <field name="state"/> - <notebook colspan="4"> - <page string="Groups"> - <field name="groups_id" nolabel="1" colspan="4"/> - </page> - </notebook> + <group colspan="4" col="6"> + <field name="sequence"/> + <field name="action_id" select="1"/> + <field name="restart"/> + </group> + <separator string="Groups" colspan="4"/> + <field name="groups_id" nolabel="1" colspan="4"/> + <separator string="State" colspan="4"/> + <group colspan="4" col="4"> + <field name="state" colspan="2" readonly="1"/> + <!--TO CHECK: This is working in tree view but not here in form view --> + <button name="action_id" states="open,skip" + string="Launch" type="action" + icon="gtk-execute" + help="Launch Configuration Wizard" /> + <button name="action_open" states="cancel,done" + string="Set as Todo" type="object" + icon="gtk-convert"/> + </group> </form> </field> </record> @@ -1552,6 +1562,7 @@ <field name="arch" type="xml"> <search string="Search Actions"> <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/> + <separator orientation="vertical"/> <field name="state"/> <field name="restart"/> </search> diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py index 3b51af26f53..b888906b5d7 100644 --- a/bin/addons/base/ir/ir_actions.py +++ b/bin/addons/base/ir/ir_actions.py @@ -754,6 +754,11 @@ class ir_actions_todo(osv.osv): 'restart': lambda *a: 'always', } _order="sequence,id" + + def action_open(self, cr, uid, ids, context=None): + """ Sets configuration wizard in TODO state""" + return self.write(cr, uid, ids, {'state': 'open'}, context=context) + ir_actions_todo() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |