[IMP] base: Improved views of Workflow Activities, Workflow transitions and added help for transition fields.

bzr revid: uco@tinyerp.com-20100825085111-jmobp7abfi131obf
This commit is contained in:
uco (Open ERP)
2010-08-25 14:21:11 +05:30
parent 9fdae47333
commit 55a565d0c6
2 changed files with 95 additions and 53 deletions
+11 -5
View File
@@ -146,11 +146,17 @@ class wkf_transition(osv.osv):
_columns = {
'trigger_model': fields.char('Trigger Object', size=128),
'trigger_expr_id': fields.char('Trigger Expression', size=128),
'signal': fields.char('Signal (button Name)', size=64),
'role_id': fields.many2one('res.roles', 'Role Required'),
'condition': fields.char('Condition', required=True, size=128),
'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'),
'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'),
'signal': fields.char('Signal (button Name)', size=64,
help="When the operation of transition comes from a button pressed in the client form, "\
"signal tests the name of the pressed button. If signal is NULL, no button is necessary to validate this transition."),
'role_id': fields.many2one('res.roles', 'Role Required',
help="The role that a user must have to validate this transition."),
'condition': fields.char('Condition', required=True, size=128,
help="Expression to be satisfied if we want the transition done."),
'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade',
help="Source activity. When this activity is over, the condition is tested to determine if we can start the ACT_TO activity."),
'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade',
help="The destination activity."),
'wkf_id': fields.related('act_from','wkf_id', type='many2one', relation='workflow', string='Workflow', select=True),
}
_defaults = {
+84 -48
View File
@@ -92,40 +92,52 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Activity">
<field colspan="4" name="name" select="1"/>
<field name="wkf_id" select="1"/>
<field name="kind" select="1"/>
<field name="action_id" select="1" colspan="4"/>
<field name="action" select="1" colspan="4" attrs="{'readonly':[('kind','=','dummy')]}"/>
<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
<field name="signal_send"/>
<newline/>
<field name="flow_start"/>
<field name="flow_stop"/>
<field name="split_mode"/>
<field name="join_mode"/>
<separator colspan="4" string="Outgoing transitions"/>
<field colspan="4" name="out_transitions" nolabel="1">
<tree string="Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="role_id"/>
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</tree>
</field>
<separator colspan="4" string="Incoming transitions"/>
<field colspan="4" name="in_transitions" nolabel="1">
<tree string="Transitions">
<field name="act_from"/>
<field name="signal"/>
<field name="role_id"/>
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</tree>
</field>
<field name="name"/>
<field name="wkf_id"/>
<group colspan="4" col="7">
<field name="kind" colspan="4"/>
<field name="flow_start"/>
<field name="flow_stop"/>
</group>
<separator string="Properties" colspan="4"/>
<group colspan="4" col="6">
<group colspan="1" col="2">
<separator string="Subflow" colspan="2"/>
<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
<field name="signal_send"/>
</group>
<group colspan="1" col="2">
<separator string="Conditions" colspan="2"/>
<field name="split_mode"/>
<field name="join_mode"/>
</group>
<group colspan="4" col="2">
<separator string="Actions" colspan="2"/>
<field name="action_id"/>
<field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/>
</group>
</group>
<separator string="Transitions" colspan="4"/>
<group colspan="4" col="4">
<group col="2" colspan="2">
<field name="in_transitions" nolabel="1">
<tree string="Incoming Transitions">
<field name="act_from"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
<group col="2" colspan="2">
<field name="out_transitions" nolabel="1">
<tree string="Outgoing Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
</group>
</form>
</field>
</record>
@@ -138,19 +150,33 @@
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<field name="action"/>
<field name="action_id"/>
<field name="flow_start"/>
<field name="flow_stop"/>
</tree>
</field>
</record>
<record id="view_workflow_activity_search" model="ir.ui.view">
<field name="name">workflow.activity.search</field>
<field name="model">workflow.activity</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Activity">
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<field name="action_id"/>
<field name="action"/>
</search>
</field>
</record>
<record id="action_workflow_activity_form" model="ir.actions.act_window">
<field name="name">Activities</field>
<field name="res_model">workflow.activity</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_activity_tree"/>
<field name="search_view_id" ref="view_workflow_activity_search"/>
</record>
<menuitem action="action_workflow_activity_form" id="menu_workflow_activity" parent="base.menu_workflow_root"/>
@@ -167,8 +193,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Transition">
<field name="act_from" select="1"/>
<field name="act_to" select="1"/>
<field name="act_from"/>
<field name="act_to"/>
<field colspan="4" name="condition"/>
<field name="signal"/>
<field name="role_id"/>
@@ -186,22 +212,32 @@
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="role_id"/>
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</tree>
</field>
</record>
<record id="view_workflow_transition_search" model="ir.ui.view">
<field name="name">workflow.transition.search</field>
<field name="model">workflow.transition</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Transition">
<field name="act_from"/>
<field name="act_to"/>
<field name="condition"/>
</search>
</field>
</record>
<record id="action_workflow_transition_form" model="ir.actions.act_window">
<field name="name">Transitions</field>
<field name="res_model">workflow.transition</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_transition_tree"/>
</record>
<menuitem action="action_workflow_transition_form" id="menu_workflow_transition" parent="base.menu_workflow_root"/>
<record id="action_workflow_transition_form" model="ir.actions.act_window">
<field name="name">Transitions</field>
<field name="res_model">workflow.transition</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_transition_tree"/>
<field name="search_view_id" ref="view_workflow_transition_search"/>
</record>
<menuitem action="action_workflow_transition_form" id="menu_workflow_transition" parent="base.menu_workflow_root"/>
<!--
================================