cafe-grader-web

Commit r249:11f906d2e75a public

parent | child
Description:
fixed login box showing in announcement box after user logged out in other tabs
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r249:11f906d2e75a - - 1 file changed: 10 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,55 +1,59
1 class MainController < ApplicationController
1 class MainController < ApplicationController
2
2
3 before_filter :authenticate, :except => [:index, :login]
3 before_filter :authenticate, :except => [:index, :login]
4 before_filter :check_viewability, :except => [:index, :login]
4 before_filter :check_viewability, :except => [:index, :login]
5
5
6 append_before_filter :update_user_start_time, :except => [:index, :login]
6 append_before_filter :update_user_start_time, :except => [:index, :login]
7
7
8 + # to prevent log in box to be shown when user logged out of the
9 + # system only in some tab
10 + prepend_before_filter :reject_announcement_refresh_when_logged_out, :only => [:announcements]
11 +
8 # COMMENTED OUT: filter in each action instead
12 # COMMENTED OUT: filter in each action instead
9 # before_filter :verify_time_limit, :only => [:submit]
13 # before_filter :verify_time_limit, :only => [:submit]
10
14
11 verify :method => :post, :only => [:submit],
15 verify :method => :post, :only => [:submit],
12 :redirect_to => { :action => :index }
16 :redirect_to => { :action => :index }
13
17
14 # COMMENT OUT: only need when having high load
18 # COMMENT OUT: only need when having high load
15 # caches_action :index, :login
19 # caches_action :index, :login
16
20
17 # NOTE: This method is not actually needed, 'config/routes.rb' has
21 # NOTE: This method is not actually needed, 'config/routes.rb' has
18 # assigned action login as a default action.
22 # assigned action login as a default action.
19 def index
23 def index
20 redirect_to :action => 'login'
24 redirect_to :action => 'login'
21 end
25 end
22
26
23 def login
27 def login
24 saved_notice = flash[:notice]
28 saved_notice = flash[:notice]
25 reset_session
29 reset_session
26 flash.now[:notice] = saved_notice
30 flash.now[:notice] = saved_notice
27
31
28 # EXPERIMENT:
32 # EXPERIMENT:
29 # Hide login if in single user mode and the url does not
33 # Hide login if in single user mode and the url does not
30 # explicitly specify /login
34 # explicitly specify /login
31 #
35 #
32 # logger.info "PATH: #{request.path}"
36 # logger.info "PATH: #{request.path}"
33 # if Configuration['system.single_user_mode'] and
37 # if Configuration['system.single_user_mode'] and
34 # request.path!='/main/login'
38 # request.path!='/main/login'
35 # @hidelogin = true
39 # @hidelogin = true
36 # end
40 # end
37
41
38 @announcements = Announcement.find_for_frontpage
42 @announcements = Announcement.find_for_frontpage
39 render :action => 'login', :layout => 'empty'
43 render :action => 'login', :layout => 'empty'
40 end
44 end
41
45
42 def list
46 def list
43 prepare_list_information
47 prepare_list_information
44 end
48 end
45
49
46 def help
50 def help
47 @user = User.find(session[:user_id])
51 @user = User.find(session[:user_id])
48 end
52 end
49
53
50 def submit
54 def submit
51 user = User.find(session[:user_id])
55 user = User.find(session[:user_id])
52
56
53 @submission = Submission.new(params[:submission])
57 @submission = Submission.new(params[:submission])
54 @submission.user = user
58 @submission.user = user
55 @submission.language_id = 0
59 @submission.language_id = 0
@@ -281,50 +285,56
281 :output_size => output_size
285 :output_size => output_size
282 }
286 }
283 end
287 end
284 end
288 end
285
289
286 # copied from grader/script/lib/test_request_helper.rb
290 # copied from grader/script/lib/test_request_helper.rb
287 def extract_running_stat(results)
291 def extract_running_stat(results)
288 running_stat_line = results[-1]
292 running_stat_line = results[-1]
289
293
290 # extract exit status line
294 # extract exit status line
291 run_stat = ""
295 run_stat = ""
292 if !(/[Cc]orrect/.match(results[0]))
296 if !(/[Cc]orrect/.match(results[0]))
293 run_stat = results[0].chomp
297 run_stat = results[0].chomp
294 else
298 else
295 run_stat = 'Program exited normally'
299 run_stat = 'Program exited normally'
296 end
300 end
297
301
298 logger.info "Stat line: #{running_stat_line}"
302 logger.info "Stat line: #{running_stat_line}"
299
303
300 # extract running time
304 # extract running time
301 if res = /r(.*)u(.*)s/.match(running_stat_line)
305 if res = /r(.*)u(.*)s/.match(running_stat_line)
302 seconds = (res[1].to_f + res[2].to_f)
306 seconds = (res[1].to_f + res[2].to_f)
303 time_stat = "Time used: #{seconds} sec."
307 time_stat = "Time used: #{seconds} sec."
304 else
308 else
305 seconds = nil
309 seconds = nil
306 time_stat = "Time used: n/a sec."
310 time_stat = "Time used: n/a sec."
307 end
311 end
308
312
309 # extract memory usage
313 # extract memory usage
310 if res = /s(.*)m/.match(running_stat_line)
314 if res = /s(.*)m/.match(running_stat_line)
311 memory_used = res[1].to_i
315 memory_used = res[1].to_i
312 else
316 else
313 memory_used = -1
317 memory_used = -1
314 end
318 end
315
319
316 return {
320 return {
317 :msg => "#{run_stat}\n#{time_stat}",
321 :msg => "#{run_stat}\n#{time_stat}",
318 :running_time => seconds,
322 :running_time => seconds,
319 :exit_status => run_stat,
323 :exit_status => run_stat,
320 :memory_usage => memory_used
324 :memory_usage => memory_used
321 }
325 }
322 end
326 end
323
327
324 def update_user_start_time
328 def update_user_start_time
325 user = User.find(session[:user_id])
329 user = User.find(session[:user_id])
326 UserContestStat.update_user_start_time(user)
330 UserContestStat.update_user_start_time(user)
327 end
331 end
328
332
333 + def reject_announcement_refresh_when_logged_out
334 + if not session[:user_id]
335 + render :text => 'Access forbidden', :status => 403
336 + end
329 end
337 end
330
338
339 + end
340 +
You need to be logged in to leave comments. Login now