Changeset 5719

Show
Ignore:
Timestamp:
03/19/08 13:38:32 (2 years ago)
Author:
uta
Message:

2008/03/19 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • rubricks_core/trunk/components/system/login_controller.rb

    r5707 r5719  
    152152      rubricks_logger({:action_type => :login, :component_name => 'auth', :component_display_name => '[_Common_Authentication]', :note => '[_System_Login_Success]', :data => login_result[:user]}) 
    153153      session[:user] = login_result[:user].id 
    154       render :text => 'ok' 
     154      @user_name = login_result[:user].name 
     155      render :template => '/system/login/login_plain_ok.rhtml' 
    155156    else 
    156157      reset_session 
    157       render :text => RubricksLib.hl(login_result[:login_message]) 
     158      @message = login_result[:login_message] 
     159      render :template => '/system/login/login_plain_ng.rhtml' 
    158160    end 
    159161  end