From 7893db9784decbd7934daa9154b158a166ccf20f Mon Sep 17 00:00:00 2001 From: MoisesMachado Date: Fri, 9 Nov 2007 21:32:20 +0000 Subject: [PATCH] ActionItem114: fixed the login form --- app/controllers/environment_admin/environment_role_manager_controller.rb | 5 +---- app/controllers/public/account_controller.rb | 2 +- app/views/account/login.rhtml | 10 ++++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/environment_admin/environment_role_manager_controller.rb b/app/controllers/environment_admin/environment_role_manager_controller.rb index 160c82d..c5cda6d 100644 --- a/app/controllers/environment_admin/environment_role_manager_controller.rb +++ b/app/controllers/environment_admin/environment_role_manager_controller.rb @@ -24,10 +24,7 @@ class EnvironmentRoleManagerController < ApplicationController def change_role @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) } @admin = Person.find(params[:id]) - @associations = RoleAssignment.find(:all, :conditions => {:accessor_id => @admin, - :accessor_type => @admin.class.base_class.name, - :resource_id => environment, - :resource_type => environment.class.base_class.name}) + @associations = @admin.find_roles(environment) end def add_role diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb index 2d4dd2c..583f0e0 100644 --- a/app/controllers/public/account_controller.rb +++ b/app/controllers/public/account_controller.rb @@ -15,7 +15,7 @@ class AccountController < PublicController def login @user = User.new return unless request.post? - self.current_user = User.authenticate(params[:user][:login], params[:user][:password]) + self.current_user = User.authenticate(params[:login], params[:password]) if logged_in? if params[:remember_me] == "1" self.current_user.remember_me diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml index 195fe9e..335792b 100644 --- a/app/views/account/login.rhtml +++ b/app/views/account/login.rhtml @@ -1,16 +1,18 @@

<%= _('Login') %>

+<% form_tag do -%> +


+<%= text_field_tag 'login' %>

-<% labelled_form_for :user, @user do |f| -%> - <%= f.text_field :login %> - <%= f.password_field :password %> -

<%= submit_tag 'Sign up', {:class => 'submit'} %>

+


+<%= password_field_tag 'password' %>

+

<%= submit_tag 'Log in', {:class => 'submit'} %>

<% end -%> -- libgit2 0.21.2