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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alecs_myu
erp5
Commits
f08c7dd1
Commit
f08c7dd1
authored
Oct 25, 2018
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Catalog: set.__iadd__ does not like iterators, so use set.update .
parent
6db6e20f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
product/ERP5Catalog/CatalogTool.py
product/ERP5Catalog/CatalogTool.py
+2
-2
No files found.
product/ERP5Catalog/CatalogTool.py
View file @
f08c7dd1
...
@@ -871,7 +871,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
...
@@ -871,7 +871,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
document_object
=
aq_inner
(
object_value
)
document_object
=
aq_inner
(
object_value
)
w
=
IndexableObjectWrapper
(
document_object
,
user_set
,
catalog_role_set
)
w
=
IndexableObjectWrapper
(
document_object
,
user_set
,
catalog_role_set
)
w
.
predicate_property_dict
=
getPredicatePropertyDict
(
object_value
)
or
{}
w
.
predicate_property_dict
=
getPredicatePropertyDict
(
object_value
)
or
{}
group_and_user_id_set
+=
w
.
_getSecurityGroupIdGenerator
(
)
group_and_user_id_set
.
update
(
w
.
_getSecurityGroupIdGenerator
()
)
# Find the parent definition for security
# Find the parent definition for security
is_acquired
=
0
is_acquired
=
0
...
@@ -887,7 +887,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
...
@@ -887,7 +887,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
break
break
if
is_acquired
:
if
is_acquired
:
document_w
=
IndexableObjectWrapper
(
document_object
,
user_set
,
catalog_role_set
)
document_w
=
IndexableObjectWrapper
(
document_object
,
user_set
,
catalog_role_set
)
group_and_user_id_set
+=
document_w
.
_getSecurityGroupIdGenerator
(
)
group_and_user_id_set
.
update
(
document_w
.
_getSecurityGroupIdGenerator
()
)
else
:
else
:
document_w
=
w
document_w
=
w
wrapper_list
.
append
((
document_object
,
w
,
document_w
))
wrapper_list
.
append
((
document_object
,
w
,
document_w
))
...
...
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