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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
erp5
Commits
7ac3444a
Commit
7ac3444a
authored
Oct 20, 2016
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Security: use select_list instead of select_expression.
parent
b1eab130
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
product/ERP5Security/ERP5UserManager.py
product/ERP5Security/ERP5UserManager.py
+3
-3
No files found.
product/ERP5Security/ERP5UserManager.py
View file @
7ac3444a
...
@@ -70,7 +70,7 @@ def getUserByLogin(portal, login, exact_match=True):
...
@@ -70,7 +70,7 @@ def getUserByLogin(portal, login, exact_match=True):
if
not
(
portal
.
portal_catalog
.
hasColumn
(
'portal_type'
)
and
portal
.
portal_catalog
.
hasColumn
(
'reference'
)):
if
not
(
portal
.
portal_catalog
.
hasColumn
(
'portal_type'
)
and
portal
.
portal_catalog
.
hasColumn
(
'reference'
)):
raise
RuntimeError
(
'Catalog does not have column information. Make sure RDB is working and disk is not full.'
)
raise
RuntimeError
(
'Catalog does not have column information. Make sure RDB is working and disk is not full.'
)
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
select_
expression
=
'reference, portal_type'
,
select_
list
=
(
'reference, portal_type'
)
,
portal_type
=
(
"ERP5 Login"
),
portal_type
=
(
"ERP5 Login"
),
reference
=
dict
(
query
=
login
,
key
=
reference_key
))
reference
=
dict
(
query
=
login
,
key
=
reference_key
))
# XXX: Here, we filter catalog result list ALTHOUGH we did pass
# XXX: Here, we filter catalog result list ALTHOUGH we did pass
...
@@ -94,7 +94,7 @@ def getUserByLogin(portal, login, exact_match=True):
...
@@ -94,7 +94,7 @@ def getUserByLogin(portal, login, exact_match=True):
if
result_list
:
if
result_list
:
return
result_list
return
result_list
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
result
=
portal
.
portal_catalog
.
unrestrictedSearchResults
(
select_
expression
=
'reference, portal_type'
,
select_
list
=
(
'reference, portal_type'
)
,
portal_type
=
(
"Person"
),
portal_type
=
(
"Person"
),
reference
=
dict
(
query
=
login
,
key
=
reference_key
))
reference
=
dict
(
query
=
login
,
key
=
reference_key
))
return
[
x
.
getObject
()
for
x
in
result
if
not
exact_match
return
[
x
.
getObject
()
for
x
in
result
if
not
exact_match
...
@@ -337,7 +337,7 @@ class ERP5UserManager(BasePlugin):
...
@@ -337,7 +337,7 @@ class ERP5UserManager(BasePlugin):
if
not
login
:
if
not
login
:
return
return
catalog_result
=
self
.
getPortalObject
().
portal_catalog
.
unrestrictedSearchResults
(
catalog_result
=
self
.
getPortalObject
().
portal_catalog
.
unrestrictedSearchResults
(
select_
expression
=
(
'portal_type'
,
'reference'
,
'validation_state'
),
select_
list
=
(
'portal_type'
,
'reference'
,
'validation_state'
),
portal_type
=
(
portal_type
,
'Person'
),
portal_type
=
(
portal_type
,
'Person'
),
reference
=
dict
(
query
=
login
,
key
=
'ExactMatch'
),
reference
=
dict
(
query
=
login
,
key
=
'ExactMatch'
),
sort_on
=
((
'portal_type'
,),),
sort_on
=
((
'portal_type'
,),),
...
...
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