Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-14 19:28:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

another set of dynamic finder migrations. All non-cucumber tests pass

Browse source
This commit is contained in:
Reinier Balt 2013-02-27 11:50:49 +01:00
parent 64a198d45a
commit ef91dd0c64
18 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/login_system.rb
View file

@ -60,7 +60,7 @@ module LoginSystem
def login_from_cookie
return unless cookies[:auth_token] && !logged_in?
token = cookies[:auth_token]
user = User.find_by_remember_token(token)
user = User.where(:remember_token => token).first
if user && user.remember_token?
session['user_id'] = user.id
set_current_user(user)
@ -72,7 +72,7 @@ module LoginSystem
def login_or_feed_token_required
if ['rss', 'atom', 'txt', 'ics'].include?(params[:format])
if user = User.find_by_token(params[:token])
if user = User.where(:token => params[:token]).first
set_current_user(user)
return true
end