summaryrefslogtreecommitdiffstats
path: root/app/controllers/sessions_controller.rb
diff options
context:
space:
mode:
authorAugust Lilleaas <augustlilleaas@gmail.com>2008-02-20 14:07:50 +0100
committerAugust Lilleaas <augustlilleaas@gmail.com>2008-02-20 14:07:50 +0100
commitd6c86886fe3d5ce12a749d27d2038b752af3f51a (patch)
treedfe531b38c9bb2e97e21ab8584c187f56881bd8b /app/controllers/sessions_controller.rb
parenta259dafd6ddd943c927946b020e94ad1b53ec902 (diff)
downloadgitorious-mainline-outdated-d6c86886fe3d5ce12a749d27d2038b752af3f51a.zip
gitorious-mainline-outdated-d6c86886fe3d5ce12a749d27d2038b752af3f51a.tar.gz
gitorious-mainline-outdated-d6c86886fe3d5ce12a749d27d2038b752af3f51a.tar.bz2
Doing flash.now instead (and specs are coming, just gotta grok how to test flash, rspec just reposts an empty hash)
Diffstat (limited to 'app/controllers/sessions_controller.rb')
-rw-r--r--app/controllers/sessions_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index d593dcc..7183891 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -5,6 +5,7 @@ class SessionsController < ApplicationController
end
def create
+ flash[:error] = "hai"
self.current_user = User.authenticate(params[:email], params[:password])
if logged_in?
if params[:remember_me] == "1"
@@ -14,7 +15,7 @@ class SessionsController < ApplicationController
redirect_back_or_default('/')
flash[:notice] = "Logged in successfully"
else
- flash[:error] = "Username/password didn't match, please try again."
+ flash.now[:error] = "Username/password didn't match, please try again."
render :action => 'new'
end
end