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
38607014
Commit
38607014
authored
Aug 08, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Workflow: remove storage id in properties from Workflow property sheet
parent
73f3f608
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Workflow/manager_bypass_property.xml
...rtal_property_sheets/Workflow/manager_bypass_property.xml
+3
-1
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Workflow/workflow_managed_permission_property.xml
..._sheets/Workflow/workflow_managed_permission_property.xml
+3
-1
product/ERP5Workflow/Document/PermissionRoles.py
product/ERP5Workflow/Document/PermissionRoles.py
+1
-1
product/ERP5Workflow/Document/Workflow.py
product/ERP5Workflow/Document/Workflow.py
+1
-5
No files found.
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Workflow/manager_bypass_property.xml
View file @
38607014
...
...
@@ -30,7 +30,9 @@
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<string>
manager_bypass
</string>
</value>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
...
...
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Workflow/workflow_managed_permission_property.xml
View file @
38607014
...
...
@@ -83,7 +83,9 @@
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<string>
managed_permission_list
</string>
</value>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
...
...
product/ERP5Workflow/Document/PermissionRoles.py
View file @
38607014
...
...
@@ -68,7 +68,7 @@ class PermissionRoles(XMLObject):
role_id
=
int
(
self
.
id
.
split
(
'_'
)[
2
])
# zwj: make sure here gets the right coordinates
workflow
=
self
.
getParent
().
getParent
()
permission_list
=
sorted
(
workflow
.
getManagedPermissionList
())
permission_list
=
sorted
(
workflow
.
get
Workflow
ManagedPermissionList
())
role_list
=
workflow
.
getManagedRoleList
()
permission
=
permission_list
[
permission_id
]
role
=
role_list
[
role_id
]
...
...
product/ERP5Workflow/Document/Workflow.py
View file @
38607014
...
...
@@ -76,7 +76,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
isPortalContent
=
1
isRADContent
=
1
default_reference
=
''
managed_permission_list
=
()
workflow_
managed_permission_list
=
()
managed_role
=
()
erp5_permission_roles
=
{}
# { permission: [role] or (role,) }
manager_bypass
=
0
...
...
@@ -143,9 +143,6 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
"""
return
DateTime
()
def
getManagedPermissionList
(
self
):
return
self
.
managed_permission_list
def
getStateChangeInformation
(
self
,
document
,
state
,
transition
=
None
):
"""
Return an object used for variable tales expression.
...
...
@@ -226,7 +223,6 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
"""
changed
=
0
sdef
=
self
.
_getWorkflowStateOf
(
document
,
id_only
=
0
)
managed_permission
=
self
.
getManagedPermissionList
()
if
sdef
is
None
:
return
0
# zwj: get all matrix cell objects
...
...
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