Mercurial > hg > soundsoftware-site
comparison app/controllers/account_controller.rb @ 1517:dffacf8a6908 redmine-2.5
Update to Redmine SVN revision 13367 on 2.5-stable branch
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:29:00 +0100 |
parents | e248c7af89ec |
children | a1bdbf8a87d5 |
comparison
equal
deleted
inserted
replaced
1516:b450a9d58aed | 1517:dffacf8a6908 |
---|---|
32 | 32 |
33 # Login request and validation | 33 # Login request and validation |
34 def login | 34 def login |
35 if request.get? | 35 if request.get? |
36 if User.current.logged? | 36 if User.current.logged? |
37 redirect_to home_url | 37 redirect_back_or_default home_url, :referer => true |
38 end | 38 end |
39 else | 39 else |
40 authenticate_user | 40 authenticate_user |
41 end | 41 end |
42 rescue AuthSourceException => e | 42 rescue AuthSourceException => e |