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

fix merge errors and some tests

Browse source
This commit is contained in:
Reinier Balt 2010-11-09 15:13:22 +01:00
parent 0f525436ff
commit f2d977e12a
7 changed files with 17 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/login_controller.rb
View file

@ -86,17 +86,8 @@ class LoginController < ApplicationController
return unless should_expire_sessions?
# Get expiry time (allow ten seconds window for the case where we have none)
expiry_time = session['expiry_time'] || Time.now + 10
<<<<<<< HEAD
@time_left = expiry_time - Time.now
if @time_left < (10*60) # Session will time out before the next check
@msg = 'login.session_time_out'
else
@msg = ""
end
=======
time_left = expiry_time - Time.now
@session_expired = ( time_left < (10*60) ) # Session will time out before the next check
>>>>>>> replace old prototype/jrails code for periodic checks and start work on autocomplete and edit projects
end
end
respond_to do |format|