migrate toggle_check and destroy and defer and get the functional tests running again

This commit is contained in:
Reinier Balt 2011-01-06 23:01:17 +01:00
parent 7a893980c2
commit a832417c59
33 changed files with 412 additions and 314 deletions

View file

@ -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