Description:
Merge branch 'master' into codejom (bug fixed)
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r250:6820e08d6a38 - - 1 file changed: 10 inserted, 0 deleted
| @@ -1,31 +1,35 | |||
|
|
1 | 1 | class MainController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | 3 | before_filter :authenticate, :except => [:index, :login] |
|
|
4 | 4 | before_filter :check_viewability, :except => [:index, :login] |
|
|
5 | 5 | |
|
|
6 | 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 | 12 | # COMMENTED OUT: filter in each action instead |
|
|
9 | 13 | # before_filter :verify_time_limit, :only => [:submit] |
|
|
10 | 14 | |
|
|
11 | 15 | verify :method => :post, :only => [:submit, :download_input, :submit_solution], |
|
|
12 | 16 | :redirect_to => { :action => :index } |
|
|
13 | 17 | |
|
|
14 | 18 | # COMMENT OUT: only need when having high load |
|
|
15 | 19 | # caches_action :index, :login |
|
|
16 | 20 | |
|
|
17 | 21 | # NOTE: This method is not actually needed, 'config/routes.rb' has |
|
|
18 | 22 | # assigned action login as a default action. |
|
|
19 | 23 | def index |
|
|
20 | 24 | redirect_to :action => 'login' |
|
|
21 | 25 | end |
|
|
22 | 26 | |
|
|
23 | 27 | def login |
|
|
24 | 28 | saved_notice = flash[:notice] |
|
|
25 | 29 | reset_session |
|
|
26 | 30 | flash.now[:notice] = saved_notice |
|
|
27 | 31 | |
|
|
28 | 32 | # EXPERIMENT: |
|
|
29 | 33 | # Hide login if in single user mode and the url does not |
|
|
30 | 34 | # explicitly specify /login |
|
|
31 | 35 | # |
| @@ -441,26 +445,32 | |||
|
|
441 | 445 | seconds = nil |
|
|
442 | 446 | time_stat = "Time used: n/a sec." |
|
|
443 | 447 | end |
|
|
444 | 448 | |
|
|
445 | 449 | # extract memory usage |
|
|
446 | 450 | if res = /s(.*)m/.match(running_stat_line) |
|
|
447 | 451 | memory_used = res[1].to_i |
|
|
448 | 452 | else |
|
|
449 | 453 | memory_used = -1 |
|
|
450 | 454 | end |
|
|
451 | 455 | |
|
|
452 | 456 | return { |
|
|
453 | 457 | :msg => "#{run_stat}\n#{time_stat}", |
|
|
454 | 458 | :running_time => seconds, |
|
|
455 | 459 | :exit_status => run_stat, |
|
|
456 | 460 | :memory_usage => memory_used |
|
|
457 | 461 | } |
|
|
458 | 462 | end |
|
|
459 | 463 | |
|
|
460 | 464 | def update_user_start_time |
|
|
461 | 465 | user = User.find(session[:user_id]) |
|
|
462 | 466 | UserContestStat.update_user_start_time(user) |
|
|
463 | 467 | end |
|
|
464 | 468 | |
|
|
469 | + def reject_announcement_refresh_when_logged_out | |
|
|
470 | + if not session[:user_id] | |
|
|
471 | + render :text => 'Access forbidden', :status => 403 | |
|
|
472 | + end | |
|
|
465 | 473 | end |
|
|
466 | 474 | |
|
|
475 | + end | |
|
|
476 | + | |
You need to be logged in to leave comments.
Login now