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
Titouan Soulard
erp5
Commits
bc8a64f4
Commit
bc8a64f4
authored
Mar 10, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "test"
This reverts commit
1e90e4f8
. missing commit message
parent
1e90e4f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
37 deletions
+2
-37
product/ERP5Catalog/CatalogTool.py
product/ERP5Catalog/CatalogTool.py
+2
-18
product/ERP5Catalog/tests/testERP5CatalogSecurityUidOptimization.py
...P5Catalog/tests/testERP5CatalogSecurityUidOptimization.py
+0
-19
No files found.
product/ERP5Catalog/CatalogTool.py
View file @
bc8a64f4
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
#
#
##############################################################################
##############################################################################
from
copy
import
deepcopy
from
collections
import
defaultdict
from
collections
import
defaultdict
from
Products.CMFCore.CatalogTool
import
CatalogTool
as
CMFCoreCatalogTool
from
Products.CMFCore.CatalogTool
import
CatalogTool
as
CMFCoreCatalogTool
from
Products.ZSQLCatalog.ZSQLCatalog
import
ZCatalog
from
Products.ZSQLCatalog.ZSQLCatalog
import
ZCatalog
...
@@ -125,23 +124,8 @@ class IndexableObjectWrapper(object):
...
@@ -125,23 +124,8 @@ class IndexableObjectWrapper(object):
allowed_role_set
.
discard
(
'Owner'
)
allowed_role_set
.
discard
(
'Owner'
)
# XXX make this a method of base ?
# XXX make this a method of base ?
local_roles_group_id_group_id
=
deepcopy
(
getattr
(
ob
,
local_roles_group_id_group_id
=
getattr
(
ob
,
'__ac_local_roles_group_id_dict__'
,
dict
()))
'__ac_local_roles_group_id_dict__'
,
dict
())
# If we acquire a permission, then we also want to acquire the local
# roles group ids
local_roles_container
=
ob
while
getattr
(
local_roles_container
,
'isRADContent'
,
0
):
if
local_roles_container
.
_getAcquireLocalRoles
():
local_roles_container
=
local_roles_container
.
aq_parent
for
role_definition_group
,
user_and_role_list
in
\
getattr
(
local_roles_container
,
'__ac_local_roles_group_id_dict__'
,
dict
()).
items
():
local_roles_group_id_group_id
.
setdefault
(
role_definition_group
,
set
()
).
update
(
user_and_role_list
)
else
:
break
allowed_by_local_roles_group_id
=
{}
allowed_by_local_roles_group_id
=
{}
allowed_by_local_roles_group_id
[
''
]
=
allowed_role_set
allowed_by_local_roles_group_id
[
''
]
=
allowed_role_set
...
...
product/ERP5Catalog/tests/testERP5CatalogSecurityUidOptimization.py
View file @
bc8a64f4
...
@@ -187,25 +187,6 @@ CREATE TABLE alternate_roles_and_users (
...
@@ -187,25 +187,6 @@ CREATE TABLE alternate_roles_and_users (
self
.
assertSameSet
([
user1
,
user2
],
self
.
assertSameSet
([
user1
,
user2
],
[
o
.
getObject
()
for
o
in
[
o
.
getObject
()
for
o
in
self
.
portal
.
portal_catalog
(
portal_type
=
'Person'
)])
self
.
portal
.
portal_catalog
(
portal_type
=
'Person'
)])
# portal types that acquire roles properly acquire the local role group
# id mapping
self
.
assertTrue
(
self
.
portal
.
portal_types
.
Career
.
getTypeAcquireLocalRole
())
career
=
user1
.
newContent
(
portal_type
=
'Career'
)
self
.
tic
()
alternate_roles_and_users
=
sql_connection
.
manage_test
(
"SELECT * from alternate_roles_and_users"
).
dictionaries
()
self
.
assertTrue
(
dict
(
uid
=
career
.
getUid
(),
alternate_security_uid
=
user1_alternate_security_uid
)
in
alternate_roles_and_users
)
self
.
login
(
'user1'
)
self
.
assertEqual
([
career
],
[
o
.
getObject
()
for
o
in
self
.
portal
.
portal_catalog
(
portal_type
=
'Career'
)])
self
.
login
(
'user2'
)
self
.
assertEqual
([],
[
o
.
getObject
()
for
o
in
self
.
portal
.
portal_catalog
(
portal_type
=
'Career'
)])
finally
:
finally
:
# restore catalog configuration
# restore catalog configuration
sql_catalog
.
sql_search_tables
=
current_sql_search_tables
sql_catalog
.
sql_search_tables
=
current_sql_search_tables
...
...
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