Patch #755 ยป login.diff
| app/views/account/login.rhtml (working copy) | ||
|---|---|---|
| 2 | 2 |
<% form_tag({:action=> "login"}) do %>
|
| 3 | 3 |
<table> |
| 4 | 4 |
<tr> |
| 5 |
<td align="right"><label for="login"><%=l(:field_login)%>:</label></td>
|
|
| 6 |
<td align="left"><p><%= text_field_tag 'login', nil, :size => 40 %></p></td>
|
|
| 5 |
<td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
|
|
| 6 |
<td align="left"><p><%= text_field_tag 'username', nil, :size => 40 %></p></td>
|
|
| 7 | 7 |
</tr> |
| 8 | 8 |
<tr> |
| 9 | 9 |
<td align="right"><label for="password"><%=l(:field_password)%>:</label></td> |
| app/controllers/account_controller.rb (working copy) | ||
|---|---|---|
| 43 | 43 |
self.logged_user = nil |
| 44 | 44 |
else |
| 45 | 45 |
# Authenticate user |
| 46 |
user = User.try_to_login(params[:login], params[:password])
|
|
| 46 |
user = User.try_to_login(params[:username], params[:password])
|
|
| 47 | 47 |
if user |
| 48 | 48 |
self.logged_user = user |
| 49 | 49 |
# generate a key and set cookie if autologin |