Commit 8d88390c authored by Ivan Tyagov's avatar Ivan Tyagov

Use user_id from preference (if available).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23613 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5d419929
...@@ -525,11 +525,12 @@ class WizardTool(BaseTool): ...@@ -525,11 +525,12 @@ class WizardTool(BaseTool):
#password = REQUEST.get('field_my_ac_password', '') #password = REQUEST.get('field_my_ac_password', '')
return self.next(REQUEST, **kw) return self.next(REQUEST, **kw)
security.declareProtected(Permissions.ModifyPortalContent, 'login') #security.declareProtected(Permissions.ModifyPortalContent, 'login')
def login(self, REQUEST): def login(self, REQUEST):
""" Login client and show next form. """ """ Login client and show next form. """
client_id = None client_id = None
user_id = REQUEST.get('field_my_ac_name', '') user_id = REQUEST.get('field_my_ac_name', None) or self.getExpressConfigurationPreference('preferred_express_user_id')
REQUEST.form['field_my_ac_name'] = user_id
password = REQUEST.get('field_my_ac_password', '') password = REQUEST.get('field_my_ac_password', '')
came_from_method = REQUEST.get('field_my_came_from_method', '') came_from_method = REQUEST.get('field_my_came_from_method', '')
## call remote server ## call remote server
...@@ -557,7 +558,7 @@ class WizardTool(BaseTool): ...@@ -557,7 +558,7 @@ class WizardTool(BaseTool):
%(came_from_method, user_id, response['server_buffer']['message'])) %(came_from_method, user_id, response['server_buffer']['message']))
return return
security.declareProtected(Permissions.ModifyPortalContent, 'next') #security.declareProtected(Permissions.ModifyPortalContent, 'next')
def next(self, REQUEST): def next(self, REQUEST):
""" Validate settings and return a new form to the user. """ """ Validate settings and return a new form to the user. """
response = self._callRemoteMethod("next") response = self._callRemoteMethod("next")
...@@ -579,7 +580,7 @@ class WizardTool(BaseTool): ...@@ -579,7 +580,7 @@ class WizardTool(BaseTool):
elif command == "install": elif command == "install":
return self.startInstallation(REQUEST=REQUEST) return self.startInstallation(REQUEST=REQUEST)
security.declareProtected(Permissions.ModifyPortalContent, 'previous') #security.declareProtected(Permissions.ModifyPortalContent, 'previous')
def previous(self, REQUEST): def previous(self, REQUEST):
""" Display the previous form. """ """ Display the previous form. """
response = self._callRemoteMethod('previous') response = self._callRemoteMethod('previous')
......
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