mirror of
https://github.com/TracksApp/tracks.git
synced 2026-01-30 20:55:17 +01:00
migrate toggle_check and destroy and defer and get the functional tests running again
This commit is contained in:
parent
7a893980c2
commit
a832417c59
33 changed files with 412 additions and 314 deletions
|
|
@ -124,9 +124,8 @@ module LoginSystem
|
|||
|
||||
def get_current_user
|
||||
if @user.nil? && session['user_id']
|
||||
@user = User.find(session['user_id'], :include => [:preference])
|
||||
@user = User.find(session['user_id'])
|
||||
end
|
||||
@prefs = @user.prefs unless @user.nil?
|
||||
@user
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue