cafe-grader-web Commit - r241:ce50017c6bce

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r241:ce50017c6bce - Fri, 29 Jan 2010 13:11:58 - 5 files changed: 12 inserted, 2 deleted

app/controllers/main_controller.rb ¶ +3

                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit, :download_input, :submit_solution],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if Configuration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new(params[:submission])
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = params['file'].read
                     @submission.source_filename = params['file'].original_filename
                   end
                   @submission.submitted_at = Time.new.gmtime
                   if Configuration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
               	flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if submission.user_id == session[:user_id]
                     send_data(submission.source,
               		{:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def submission
+            +     # protect the action for Code Jom
+            +     redirect_to :action => 'list'
+            +
                   @user = User.find(session[:user_id])
                   @problems = Problem.find_available_problems
                   if params[:id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_name(params[:id])
                     if not @problem.available
                       redirect_to :action => 'list'
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   end
                 end
                 def result
                   if !Configuration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !Configuration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                   out_filename = output_filename(@user.login,
                                                  @submission.problem.name,
                                                  @submission.id,
                                                  case_num)
                   if !FileTest.exists?(out_filename)
                     flash[:notice] = 'Output not found.'
                     redirect_to :action => 'list' and return
                   end
                   response.headers['Content-Type'] = "application/force-download"
                   response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
                   response.headers["X-Sendfile"] = out_filename
                   response.headers['Content-length'] = File.size(out_filename)
                   render :nothing => true
                 end
                 def error
                   @user = User.find(session[:user_id])
                 end
                 # announcement refreshing and hiding methods
                 def announcements
                   if params.has_key? 'recent'
                     prepare_announcements(params[:recent])
                   else
                     prepare_announcements
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
                 #
                 # actions for Code Jom
                 #
                 def download_input
                   problem = Problem.find(params[:id])
                   user = User.find(session[:user_id])
                   if user.can_request_new_test_pair_for? problem
                     assignment = user.get_new_test_pair_assignment_for problem
                     assignment.save
                     send_data(assignment.test_pair.input,
                               { :filename => "#{problem.name}-#{assignment.request_number}.in",
                                 :type => 'text/plain' })
                   else
                     recent_assignment = user.get_recent_test_pair_assignment_for problem
                     send_data(recent_assignment.test_pair.input,
                               { :filename => "#{problem.name}-#{recent_assignment.request_number}.in",
                                 :type => 'text/plain' })
                   end
                 end
                 def submit_solution
                   problem = Problem.find(params[:id])

app/controllers/statuses_controller.rb ¶ +3

               class StatusesController < ApplicationController
+            +   # protect the statuses, for now
+            +   before_filter :admin_authorization
+            +
                 def index
                   problem_count = Problem.available_problem_count
                   @dead_users = []
                   @level_users = {}
                   @levels = (0..CODEJOM_MAX_ALIVE_LEVEL)
                   @levels.each { |l| @level_users[l] = [] }
                   User.find(:all).each do |user|
                     if user.codejom_status==nil
                       user.update_codejom_status
                       user.codejom_status(true)  # reload
                     end
                     if not user.codejom_status.alive
                       @dead_users << user
                     else
                       @level_users[user.codejom_level] << user
                     end
                   end
                 end
               end

app/controllers/test_controller.rb ¶ +3

               class TestController < ApplicationController
+            +   # this page is unavailable in Code Jom
+            +   before_filter :admin_authorization
+            +
                 before_filter :authenticate, :check_viewability
               #
               #  COMMENT OUT: filter in each action instead
               #
               #  before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   prepare_index_information
                 end
                 def submit
                   @user = User.find(session[:user_id])
                   @submitted_test_request = TestRequest.new_from_form_params(@user,params[:test_request])
                   if @submitted_test_request.errors.length != 0
                     prepare_index_information
                     render :action => 'index' and return
                   end
                   if Configuration.time_limit_mode?
                     if @user.contest_finished?
                       @submitted_test_request.errors.add_to_base('Contest is over.')
                       prepare_index_information
                       render :action => 'index' and return
                     end
                     if !Configuration.allow_test_request(@user)
                       prepare_index_information
                       flash[:notice] = 'Test request is not allowed during the last 30 minutes'
                       redirect_to :action => 'index' and return
                     end
                   end
                   if @submitted_test_request.save
                     redirect_to :action => 'index'
                   else
                     prepare_index_information
                     render :action => 'index'
                   end
                 end
                 def read
                   user = User.find(session[:user_id])
                   begin
                     test_request = TestRequest.find(params[:id])
                   rescue
                     test_request = nil
                   end
                   if test_request==nil or test_request.user_id != user.id
                     flash[:notice] = 'Invalid output'
                     redirect_to :action => 'index'
                     return
                   end
                   if test_request.output_file_name!=nil
                     data = File.open(test_request.output_file_name).read(2048)
                     if data==nil
                       data=""
                     end
                     send_data(data,
                               {:filename => 'output.txt',
                                 :type => 'text/plain'})
                     return
                   end
                   redirect_to :action => 'index'
                 end
                 def result
                   @user = User.find(session[:user_id])
                   begin
                     @test_request = TestRequest.find(params[:id])
                   rescue
                     @test_request = nil
                   end
                   if @test_request==nil or @test_request.user_id != @user.id
                     flash[:notice] = 'Invalid request'
                     redirect_to :action => 'index'
                     return
                   end
                 end
                 protected
                 def prepare_index_information
                   @user = User.find(session[:user_id])
                   @submissions = Submission.find_last_for_all_available_problems(@user.id)
                   all_problems = @submissions.collect { |submission| submission.problem }
                   @problems = []
                   all_problems.each do |problem|
                     if problem.test_allowed
                       @problems << problem
                     end

app/views/main/_problem_title.html.haml ¶ +1 -1

               .problem-bar{:id => "problem-bar-#{problem.id}"}
                 %a{:href => "#", :onclick => "$$('.problem-panel').each(function(elt) {elt.hide();});  $('problem-panel-#{problem.id}').show(); $('problem-panel-filler').hide(); return false;"}
                   %span{:class => 'problem-title'}
-            -       = "#{problem.full_name} (#{problem.name})"
+            +       = "#{problem.full_name}"
                   - if @prob_submissions[problem_title_counter][:count] > 0
                     = "[#{@prob_submissions[problem_title_counter][:count]} trials(s)]"
                   - else
                     [No trials]

app/views/main/list.html.haml ¶ +2 -1

               - content_for :head do
                 = javascript_include_tag :defaults
                 = javascript_include_tag 'announcement_refresh.js'
                 = javascript_include_tag 'codejom_timeout.js'
               = user_title_bar(@user)
               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               %hr/
               - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
                 .problem-list
                   = render :partial => 'problem_title', :collection => @problems, :as => :problem
                 .problem-content
                   %span{:id => "problem-panel-filler", :style => (@current_problem_id!=nil) ? "display:none" : ""}
-            -       %b Welcome to Code Jom
+            +       %h2
+            +         Welcome to Code Jom
                     %br/
                     Choose problems from the list on the right.
                   = render :partial => 'problem', :collection => @problems
               %br{:clear=>'both'}/
               %hr/
               %script{:type => "text/javascript"}
                 Announcement.registerRefreshEventTimer();
                 = render :partial => 'submission_timeouts'
                 CodejomTimeout.updateProblemMessages();
                 CodejomTimeout.registerRefreshEvent();

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r241:ce50017c6bce - Fri, 29 Jan 2010 13:11:58 - 5 files changed: 12 inserted, 2 deleted

Sign in to your account

Commit r241:ce50017c6bce public

Author

r241:ce50017c6bce - Fri, 29 Jan 2010 13:11:58 - 5 files changed: 12 inserted, 2 deleted

Commit `r241:ce50017c6bce` public