Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
erp5
Commits
580a4a08
Commit
580a4a08
authored
Jul 26, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Workflow: revert changes on automatic_update_property
+ rename update_always to automatic_update as is should be
parent
1985ac2c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
11 deletions
+7
-11
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Variable/automatic_update_property.xml
...al_property_sheets/Variable/automatic_update_property.xml
+1
-5
product/ERP5Workflow/Document/InteractionWorkflow.py
product/ERP5Workflow/Document/InteractionWorkflow.py
+2
-2
product/ERP5Workflow/Document/Variable.py
product/ERP5Workflow/Document/Variable.py
+1
-1
product/ERP5Workflow/Document/Workflow.py
product/ERP5Workflow/Document/Workflow.py
+3
-3
No files found.
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Variable/automatic_update_property.xml
View file @
580a4a08
...
...
@@ -27,7 +27,7 @@
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/
int
</string>
<string>
elementary_type/
boolean
</string>
</tuple>
</value>
</item>
...
...
@@ -47,10 +47,6 @@
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<string>
update_always
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
...
...
product/ERP5Workflow/Document/InteractionWorkflow.py
View file @
580a4a08
...
...
@@ -469,7 +469,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
variable_reference_list
=
[]
variable_list
=
self
.
objectValues
(
portal_type
=
'Variable'
)
variable_prop_id_to_show
=
[
'description'
,
'variable_expression'
,
'for_catalog'
,
'for_status'
,
'
update_always
'
]
'for_catalog'
,
'for_status'
,
'
automatic_update
'
]
for
vdef
in
variable_list
:
variable_reference_list
.
append
(
vdef
.
getReference
())
variables
=
SubElement
(
interaction_workflow
,
'variables'
,
attrib
=
dict
(
variable_list
=
str
(
variable_reference_list
),
...
...
@@ -478,7 +478,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
variable
=
SubElement
(
variables
,
'variable'
,
attrib
=
dict
(
reference
=
vdef
.
getReference
(),
portal_type
=
vdef
.
getPortalType
()))
for
property_id
in
sorted
(
variable_prop_id_to_show
):
if
property_id
==
'
update_always
'
:
if
property_id
==
'
automatic_update
'
:
property_value
=
vdef
.
getAutomaticUpdate
()
sub_object
=
SubElement
(
variable
,
property_id
,
attrib
=
dict
(
type
=
'int'
))
elif
property_id
==
'variable_value'
:
...
...
product/ERP5Workflow/Document/Variable.py
View file @
580a4a08
...
...
@@ -50,7 +50,7 @@ class Variable(IdAsReferenceMixin("variable_", "prefix"), XMLObject):
for_status
=
1
variable_value
=
''
variable_expression
=
None
# Overrides variable_value if set
update_always
=
1
automatic_update
=
1
default_reference
=
''
# Declarative security
security
=
ClassSecurityInfo
()
...
...
product/ERP5Workflow/Document/Workflow.py
View file @
580a4a08
...
...
@@ -901,16 +901,16 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
variable_reference_list
=
[]
variable_list
=
self
.
objectValues
(
portal_type
=
'Variable'
)
variable_prop_id_to_show
=
[
'description'
,
'variable_expression'
,
'for_catalog'
,
'for_status'
,
'
update_always
'
]
'for_catalog'
,
'for_status'
,
'
automatic_update
'
]
for
vdef
in
variable_list
:
variable_reference_list
.
append
(
vdef
.
getReference
())
variables
=
SubElement
(
workflow
,
'variables'
,
attrib
=
dict
(
variable_list
=
str
(
variable_reference_list
),
number_of_element
=
str
(
len
(
variable_reference_list
))))
number_of_element
=
str
(
len
(
variable_reference_list
))))
for
vdef
in
variable_list
:
variable
=
SubElement
(
variables
,
'variable'
,
attrib
=
dict
(
reference
=
vdef
.
getReference
(),
portal_type
=
vdef
.
getPortalType
()))
for
property_id
in
sorted
(
variable_prop_id_to_show
):
if
property_id
==
'
update_always
'
:
if
property_id
==
'
automatic_update
'
:
property_value
=
vdef
.
getAutomaticUpdate
()
sub_object
=
SubElement
(
variable
,
property_id
,
attrib
=
dict
(
type
=
'int'
))
elif
property_id
==
'variable_value'
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment