Download as
Browse Code »

Commit c0ac8681c26789bd51ae4bdda307f6f36f4479a0

Authored by MoisesMachado
1 parent b5e4298d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @c0ac868
@@ -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
  Diff comments   View file @c0ac868
@@ -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