Download as
Browse Code »

Commit 7893db9784decbd7934daa9154b158a166ccf20f

Authored by MoisesMachado
1 parent adf997c3
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

ActionItem114: fixed the login form 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@890 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 8 additions and 9 deletions   Show diff stats
app/controllers/environment_admin/environment_role_manager_controller.rb
  Diff comments   View file @7893db9
@@ -24,10 +24,7 @@ class EnvironmentRoleManagerController < ApplicationController @@ -24,10 +24,7 @@ class EnvironmentRoleManagerController < ApplicationController
24 def change_role 24 def change_role
25 @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) } 25 @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
26 @admin = Person.find(params[:id]) 26 @admin = Person.find(params[:id])
27 - @associations = RoleAssignment.find(:all, :conditions => {:accessor_id => @admin,  
28 - :accessor_type => @admin.class.base_class.name,  
29 - :resource_id => environment,  
30 - :resource_type => environment.class.base_class.name}) 27 + @associations = @admin.find_roles(environment)
31 end 28 end
32 29
33 def add_role 30 def add_role
app/controllers/public/account_controller.rb
  Diff comments   View file @7893db9
@@ -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 @7893db9
1 <h1><%= _('Login') %></h1> 1 <h1><%= _('Login') %></h1>
2 2
  3 +<% form_tag do -%>
  4 + <p class='formfield text_field'><label class='formlabel' for="login"> <%= _('Username') %> </label><br/>
  5 +<%= text_field_tag 'login' %></p>
3 6
4 -<% labelled_form_for :user, @user do |f| -%>  
5 - <%= f.text_field :login %>  
6 - <%= f.password_field :password %>  
7 - <p class="submitline"><%= submit_tag 'Sign up', {:class => 'submit'} %></p> 7 +<p class='formfield text_field'><label class='formlabel' for="password"> <%= _('Password') %></label><br/>
  8 +<%= password_field_tag 'password' %></p>
8 9
9 <!-- Uncomment this if you want this functionality 10 <!-- Uncomment this if you want this functionality
10 <p><label for="remember_me">Remember me:</label> 11 <p><label for="remember_me">Remember me:</label>
11 <%= check_box_tag 'remember_me' %></p> 12 <%= check_box_tag 'remember_me' %></p>
12 --> 13 -->
13 14
  15 +<p class='submitline'><%= submit_tag 'Log in', {:class => 'submit'} %></p>
14 <% end -%> 16 <% end -%>
15 17
16 18