Commit 370eebef authored by Vincent Pelletier's avatar Vincent Pelletier

Revert parts of r20897 because getUserByLogin always checks & converts its parameters now.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21241 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fd9ec558
...@@ -88,7 +88,7 @@ class ERP5UserManager(BasePlugin): ...@@ -88,7 +88,7 @@ class ERP5UserManager(BasePlugin):
if not login or not password: if not login or not password:
return None return None
user_list = self.getUserByLogin((login,)) user_list = self.getUserByLogin(login)
if not user_list: if not user_list:
return None return None
...@@ -172,10 +172,10 @@ class ERP5UserManager(BasePlugin): ...@@ -172,10 +172,10 @@ class ERP5UserManager(BasePlugin):
if id is None: if id is None:
id = login id = login
if isinstance(id, str):
id = (id,)
if isinstance(id, list): if isinstance(id, list):
id = tuple(id) id = tuple(id)
elif not isinstance(id, tuple):
id = (id,)
return _enumerateUsers(id_tuple=id, return _enumerateUsers(id_tuple=id,
exact_match=exact_match, exact_match=exact_match,
path=self.getPhysicalPath()) path=self.getPhysicalPath())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment