cafe-grader-web

Commit r241:ce50017c6bce public

parent | child
Description:
disabled unused actions from controllers, protected statuses display, more styling
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

r241:ce50017c6bce - - 5 files changed: 12 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -91,24 +91,27
91
91
92 def compiler_msg
92 def compiler_msg
93 @submission = Submission.find(params[:id])
93 @submission = Submission.find(params[:id])
94 if @submission.user_id == session[:user_id]
94 if @submission.user_id == session[:user_id]
95 render :action => 'compiler_msg', :layout => 'empty'
95 render :action => 'compiler_msg', :layout => 'empty'
96 else
96 else
97 flash[:notice] = 'Error viewing source'
97 flash[:notice] = 'Error viewing source'
98 redirect_to :action => 'list'
98 redirect_to :action => 'list'
99 end
99 end
100 end
100 end
101
101
102 def submission
102 def submission
103 + # protect the action for Code Jom
104 + redirect_to :action => 'list'
105 +
103 @user = User.find(session[:user_id])
106 @user = User.find(session[:user_id])
104 @problems = Problem.find_available_problems
107 @problems = Problem.find_available_problems
105 if params[:id]==nil
108 if params[:id]==nil
106 @problem = nil
109 @problem = nil
107 @submissions = nil
110 @submissions = nil
108 else
111 else
109 @problem = Problem.find_by_name(params[:id])
112 @problem = Problem.find_by_name(params[:id])
110 if not @problem.available
113 if not @problem.available
111 redirect_to :action => 'list'
114 redirect_to :action => 'list'
112 flash[:notice] = 'Error: submissions for that problem are not viewable.'
115 flash[:notice] = 'Error: submissions for that problem are not viewable.'
113 return
116 return
114 end
117 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,14 +1,17
1 class StatusesController < ApplicationController
1 class StatusesController < ApplicationController
2
2
3 + # protect the statuses, for now
4 + before_filter :admin_authorization
5 +
3 def index
6 def index
4 problem_count = Problem.available_problem_count
7 problem_count = Problem.available_problem_count
5
8
6 @dead_users = []
9 @dead_users = []
7 @level_users = {}
10 @level_users = {}
8 @levels = (0..CODEJOM_MAX_ALIVE_LEVEL)
11 @levels = (0..CODEJOM_MAX_ALIVE_LEVEL)
9 @levels.each { |l| @level_users[l] = [] }
12 @levels.each { |l| @level_users[l] = [] }
10 User.find(:all).each do |user|
13 User.find(:all).each do |user|
11 if user.codejom_status==nil
14 if user.codejom_status==nil
12 user.update_codejom_status
15 user.update_codejom_status
13 user.codejom_status(true) # reload
16 user.codejom_status(true) # reload
14 end
17 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,14 +1,17
1 class TestController < ApplicationController
1 class TestController < ApplicationController
2
2
3 + # this page is unavailable in Code Jom
4 + before_filter :admin_authorization
5 +
3 before_filter :authenticate, :check_viewability
6 before_filter :authenticate, :check_viewability
4
7
5 #
8 #
6 # COMMENT OUT: filter in each action instead
9 # COMMENT OUT: filter in each action instead
7 #
10 #
8 # before_filter :verify_time_limit, :only => [:submit]
11 # before_filter :verify_time_limit, :only => [:submit]
9
12
10 verify :method => :post, :only => [:submit],
13 verify :method => :post, :only => [:submit],
11 :redirect_to => { :action => :index }
14 :redirect_to => { :action => :index }
12
15
13 def index
16 def index
14 prepare_index_information
17 prepare_index_information
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,8 +1,8
1 .problem-bar{:id => "problem-bar-#{problem.id}"}
1 .problem-bar{:id => "problem-bar-#{problem.id}"}
2 %a{:href => "#", :onclick => "$$('.problem-panel').each(function(elt) {elt.hide();}); $('problem-panel-#{problem.id}').show(); $('problem-panel-filler').hide(); return false;"}
2 %a{:href => "#", :onclick => "$$('.problem-panel').each(function(elt) {elt.hide();}); $('problem-panel-#{problem.id}').show(); $('problem-panel-filler').hide(); return false;"}
3 %span{:class => 'problem-title'}
3 %span{:class => 'problem-title'}
4 - = "#{problem.full_name} (#{problem.name})"
4 + = "#{problem.full_name}"
5 - if @prob_submissions[problem_title_counter][:count] > 0
5 - if @prob_submissions[problem_title_counter][:count] > 0
6 = "[#{@prob_submissions[problem_title_counter][:count]} trials(s)]"
6 = "[#{@prob_submissions[problem_title_counter][:count]} trials(s)]"
7 - else
7 - else
8 [No trials]
8 [No trials]
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -12,25 +12,26
12 = render :partial => 'announcement', :collection => @announcements
12 = render :partial => 'announcement', :collection => @announcements
13
13
14 %hr/
14 %hr/
15
15
16 - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
16 - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
17 %p=t 'main.start_soon'
17 %p=t 'main.start_soon'
18
18
19 - if Configuration.show_tasks_to?(@user)
19 - if Configuration.show_tasks_to?(@user)
20 .problem-list
20 .problem-list
21 = render :partial => 'problem_title', :collection => @problems, :as => :problem
21 = render :partial => 'problem_title', :collection => @problems, :as => :problem
22 .problem-content
22 .problem-content
23 %span{:id => "problem-panel-filler", :style => (@current_problem_id!=nil) ? "display:none" : ""}
23 %span{:id => "problem-panel-filler", :style => (@current_problem_id!=nil) ? "display:none" : ""}
24 - %b Welcome to Code Jom
24 + %h2
25 + Welcome to Code Jom
25 %br/
26 %br/
26 Choose problems from the list on the right.
27 Choose problems from the list on the right.
27 = render :partial => 'problem', :collection => @problems
28 = render :partial => 'problem', :collection => @problems
28
29
29 %br{:clear=>'both'}/
30 %br{:clear=>'both'}/
30 %hr/
31 %hr/
31
32
32 %script{:type => "text/javascript"}
33 %script{:type => "text/javascript"}
33 Announcement.registerRefreshEventTimer();
34 Announcement.registerRefreshEventTimer();
34 = render :partial => 'submission_timeouts'
35 = render :partial => 'submission_timeouts'
35 CodejomTimeout.updateProblemMessages();
36 CodejomTimeout.updateProblemMessages();
36 CodejomTimeout.registerRefreshEvent();
37 CodejomTimeout.registerRefreshEvent();
You need to be logged in to leave comments. Login now