app/controllers/admin/welcome_controller.rb in radiant-0.5.2 vs app/controllers/admin/welcome_controller.rb in radiant-0.6.0

- old
+ new

@@ -1,39 +1,37 @@ class Admin::WelcomeController < ApplicationController no_login_required - - model :user - + def index redirect_to page_index_url end def login if request.post? login = params[:user][:login] password = params[:user][:password] - session[:user] = User.authenticate(login, password) - if session[:user] + session['user'] = User.authenticate(login, password) + if session['user'] redirect_to welcome_url else announce_invalid_user end end end def logout - session[:user] = nil + session['user'] = nil announce_logged_out redirect_to login_url end - + private - + def announce_logged_out flash[:notice] = 'You are now logged out.' end - + def announce_invalid_user flash[:error] = 'Invalid username or password.' end - + end