Commit c0ac8681c26789bd51ae4bdda307f6f36f4479a0
1 parent
b5e4298d
Exists in
master
and in
28 other branches
ActionItem135: fixed the login page
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1092 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
app/controllers/public/account_controller.rb
| @@ -15,7 +15,7 @@ class AccountController < PublicController | @@ -15,7 +15,7 @@ class AccountController < PublicController | ||
| 15 | def login | 15 | def login |
| 16 | @user = User.new | 16 | @user = User.new |
| 17 | return unless request.post? | 17 | return unless request.post? |
| 18 | - self.current_user = User.authenticate(params[:user][:login], params[:user][:password]) | 18 | + self.current_user = User.authenticate(params[:login], params[:password]) |
| 19 | if logged_in? | 19 | if logged_in? |
| 20 | if params[:remember_me] == "1" | 20 | if params[:remember_me] == "1" |
| 21 | self.current_user.remember_me | 21 | self.current_user.remember_me |
app/views/account/login.rhtml
| @@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
| 2 | 2 | ||
| 3 | <% labelled_form_for :user, @user do |f| %> | 3 | <% labelled_form_for :user, @user do |f| %> |
| 4 | 4 | ||
| 5 | -<%= f.text_field :login %> | 5 | +<%= display_form_field(_('Login'), text_field_tag(:login) ) %> |
| 6 | 6 | ||
| 7 | -<%= f.password_field :password %> | 7 | +<%= display_form_field(_('Password'), password_field_tag(:password) ) %> |
| 8 | 8 | ||
| 9 | <%= display_submit_tag 'Log in' %> | 9 | <%= display_submit_tag 'Log in' %> |
| 10 | 10 |