Skip to content

erp5
erp5
Commit 64ecbe33 authored by iv's avatar iv
Browse files
Options

ERP5Workflow: for_status -> status_included, add Property Sheets in WorkflowVariable class

parent a876187d
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 192 deletions
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Variable_view/my_for_status.xml
View file @ 64ecbe33
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_for_status</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Store in Workflow Status</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getForStatus()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Variable_view/my_status_included.xml 0 → 100644
View file @ 64ecbe33
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_status_included</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Store in Workflow Status</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getForStatus()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5Workflow/Document/InteractionWorkflow.py
View file @ 64ecbe33
...@@ -277,7 +277,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow): ...@@ -277,7 +277,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
for vdef in self.objectValues(portal_type='Workflow Variable'): for vdef in self.objectValues(portal_type='Workflow Variable'):
id = vdef.getId() id = vdef.getId()
if not vdef.getForStatus(): if not vdef.getStatusIncluded():
continue continue
expression = None expression = None
if id in tdef_exprs: if id in tdef_exprs:
......
product/ERP5Workflow/Document/Workflow.py
View file @ 64ecbe33
...@@ -650,7 +650,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject): ...@@ -650,7 +650,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
for vdef in self.objectValues(portal_type='Workflow Variable'): for vdef in self.objectValues(portal_type='Workflow Variable'):
id = vdef.getId() id = vdef.getId()
variable_reference = vdef.getReference() variable_reference = vdef.getReference()
if not vdef.getForStatus() or vdef.getForStatus() == 0: if not vdef.getStatusIncluded():
continue continue
expr = None expr = None
if variable_reference in state_values: if variable_reference in state_values:
...@@ -1050,7 +1050,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject): ...@@ -1050,7 +1050,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
tdef_exprs = {} tdef_exprs = {}
status = {} status = {}
for id, vdef in self.getVariableValueDict().items(): for id, vdef in self.getVariableValueDict().items():
if vdef.getForStatus() == 0: if not vdef.getStatusIncluded():
continue continue
expr = None expr = None
if state_values.has_key(id): if state_values.has_key(id):
......
product/ERP5Workflow/Document/WorkflowVariable.py
View file @ 64ecbe33
...@@ -41,15 +41,13 @@ class WorkflowVariable(IdAsReferenceMixin("variable_", "prefix"), XMLObject): ...@@ -41,15 +41,13 @@ class WorkflowVariable(IdAsReferenceMixin("variable_", "prefix"), XMLObject):
meta_type = 'ERP5 Variable' meta_type = 'ERP5 Variable'
portal_type = 'Workflow Variable' portal_type = 'Workflow Variable'
add_permission = Permissions.AddPortalContent add_permission = Permissions.AddPortalContent
isPortalContent = 1 isPortalContent = True
isRADContent = 1 isRADContent = True
info_guard = None info_guard = None
for_catalog = 1 status_included = True
for_status = 1
variable_value = '' variable_value = ''
variable_expression = None # Overrides variable_value if set variable_expression = None # Overrides variable_value if set
automatic_update = 1
default_reference = '' default_reference = ''
# Declarative security # Declarative security
security = ClassSecurityInfo() security = ClassSecurityInfo()
...@@ -63,6 +61,8 @@ class WorkflowVariable(IdAsReferenceMixin("variable_", "prefix"), XMLObject): ...@@ -63,6 +61,8 @@ class WorkflowVariable(IdAsReferenceMixin("variable_", "prefix"), XMLObject):
PropertySheet.DublinCore, PropertySheet.DublinCore,
PropertySheet.Reference, PropertySheet.Reference,
PropertySheet.Variable, PropertySheet.Variable,
PropertySheet.Guard,
PropertySheet.WorkflowVariable,
) )
def getInfoGuardSummary(self): def getInfoGuardSummary(self):
......
product/ERP5Workflow/Tool/WorkflowTool.py
View file @ 64ecbe33
...@@ -517,7 +517,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool): ...@@ -517,7 +517,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
# Here add expression text, convert to expression in getMatchVar. # Here add expression text, convert to expression in getMatchVar.
variable.setExpression(tdef.info_guard.expr.text) variable.setExpression(tdef.info_guard.expr.text)
variable.setForCatalog(variable_definition.for_catalog) variable.setForCatalog(variable_definition.for_catalog)
variable.setForStatus(variable_definition.for_status) variable.setStatusIncluded(variable_definition.for_status)
variable.setVariableValue(variable_definition.default_value) variable.setVariableValue(variable_definition.default_value)
variable.setDescription(variable_definition.description) variable.setDescription(variable_definition.description)
# Configure transition variable: # Configure transition variable:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7