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 | 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, :download_input, :submit_solution], |
|
15 | verify :method => :post, :only => [:submit, :download_input, :submit_solution], |
|
|
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 | # |
| @@ -441,26 +445,32 | |||||
|
|
441 | seconds = nil |
|
445 | seconds = nil |
|
|
442 | time_stat = "Time used: n/a sec." |
|
446 | time_stat = "Time used: n/a sec." |
|
|
443 | end |
|
447 | end |
|
|
444 |
|
448 | ||
|
|
445 | # extract memory usage |
|
449 | # extract memory usage |
|
|
446 | if res = /s(.*)m/.match(running_stat_line) |
|
450 | if res = /s(.*)m/.match(running_stat_line) |
|
|
447 | memory_used = res[1].to_i |
|
451 | memory_used = res[1].to_i |
|
|
448 | else |
|
452 | else |
|
|
449 | memory_used = -1 |
|
453 | memory_used = -1 |
|
|
450 | end |
|
454 | end |
|
|
451 |
|
455 | ||
|
|
452 | return { |
|
456 | return { |
|
|
453 | :msg => "#{run_stat}\n#{time_stat}", |
|
457 | :msg => "#{run_stat}\n#{time_stat}", |
|
|
454 | :running_time => seconds, |
|
458 | :running_time => seconds, |
|
|
455 | :exit_status => run_stat, |
|
459 | :exit_status => run_stat, |
|
|
456 | :memory_usage => memory_used |
|
460 | :memory_usage => memory_used |
|
|
457 | } |
|
461 | } |
|
|
458 | end |
|
462 | end |
|
|
459 |
|
463 | ||
|
|
460 | def update_user_start_time |
|
464 | def update_user_start_time |
|
|
461 | user = User.find(session[:user_id]) |
|
465 | user = User.find(session[:user_id]) |
|
|
462 | UserContestStat.update_user_start_time(user) |
|
466 | UserContestStat.update_user_start_time(user) |
|
|
463 | end |
|
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 | ||
|
|
|
473 | + end | ||
|
|
|
474 | + | ||
|
|
465 | end |
|
475 | end |
|
|
466 |
|
476 | ||
You need to be logged in to leave comments.
Login now