cafe-grader-web Commit - r86:9bdacfc7b6d7

cafe-grader-web

Commit `r86:9bdacfc7b6d7` public

parent | child

Description:

[web] fixed test_request error when user does not put in any file git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@170 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r86:9bdacfc7b6d7 - Sat, 12 Apr 2008 09:03:12 - 3 files changed: 26 inserted, 9 deleted

app/controllers/test_controller.rb ¶ +16 -9

                 before_filter :authenticate
               #
               #  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
-            -     @user = User.find(session[:user_id])
                   prepare_index_information
-            -     @test_requests = @user.test_requests
                 end
                 def submit
                   @user = User.find(session[:user_id])
-            -     if @user.site!=nil and @user.site.finished?
-            -       flash[:notice] = 'Error saving your test submission: Contest is over.'
-            -       redirect_to :action => 'index' and return
+            +     @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
-            -     test_request = TestRequest.new_from_form_params(@user,params[:test_request])
-            -     if test_request.save
+            +     if @user.site!=nil and @user.site.finished?
+            +       @submitted_test_request.errors.add_to_base('Contest is over.')
+            +       prepare_index_information
+            +       render :action => 'index' and return
+            +     end
+            +
+            +     if @submitted_test_request.save
                     redirect_to :action => 'index'
                   else
-            -       flash[:notice] = 'Error saving your test submission'
-            -       redirect_to :action => 'index'
+            +       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'
                     @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)
                   @problems = @submissions.collect { |submission| submission.problem }
+            +     @test_requests = @user.test_requests
                 end
               end

app/models/test_request.rb ¶ +7

                 # interfacing with form
                 def self.new_from_form_params(user,params)
                   test_request = TestRequest.new
                   test_request.user = user
                   problem = Problem.find(params[:problem_id])
                   test_request.problem = problem
                   test_request.submission =
                     Submission.find_by_user_problem_number(user.id,
                                                            problem.id,
                                                            params[:submission_number])
                   test_request.input_file_name = save_input_file(params[:input_file], user, problem)
+            +     if test_request.input_file_name == nil
+            +       test_request.errors.add_to_base("No input submitted.")
+            +     end
                   test_request.submitted_at = Time.new
                   test_request.status_inqueue
                   test_request
                 end
                 protected
                 def self.name_of(problem)
                   if problem!=nil
                     problem.name
                   else
                     "default"
                 def self.random_input_file_name(user,problem)
                   problem_name = TestRequest.name_of(problem)
                   begin
                     tmpname = TEST_REQUEST_INPUT_FILE_DIR + "/#{user.login}/#{problem_name}/#{rand(10000)}"
                   end while File.exists?(tmpname)
                   tmpname
                 end
                 def self.save_input_file(tempfile, user, problem)
                   new_file_name = random_input_file_name(user,problem)
                   dirname = File.dirname(new_file_name)
                   FileUtils.mkdir_p(File.dirname(new_file_name)) if !File.exists?(dirname)
+            +
+            +     # when the user did not submit any file
+            +     return nil if tempfile==""
+            +
                   if tempfile.instance_of?(Tempfile)
                     tempfile.close
                     FileUtils.move(tempfile.path,new_file_name)
-                  else
                     File.open(new_file_name, "wb") do |f|
                       f.write(tempfile.read)
                     end
                   end
                   new_file_name
                 end
               end

app/views/test/index.html.erb ¶ +3

                 for(i=0; i<old_len; i++)
                   submissionSelect.remove(0);
                 for(i=count; i>=1; i--) {
                   try {
                     submissionSelect.add(new Option(""+i,""+i,false,false),null);
                   } catch(ex) {
                     submissionSelect.add(new Option(""+i,""+i,false,false));
                   }
                 }
               }
               </script>
+            + <div class="submitbox">
+            + <%= error_messages_for 'submitted_test_request' %>
               <% form_for :test_request, nil,
                           :url => { :action => 'submit'},
                           :html => { :multipart => true } do |f| %>
                 <table>
                   <tr>
                     <td>Task:</td>
                     <td>
               	<%= select(:test_request,
               	           :problem_id,
               	           @problems.collect {|p| [p.name, p.id]}, {},
               	           { :onclick => "updateSubmissionList();" }) %>
                     </td>
                     </td>
                   </tr>
                   <tr>
                     <td>Input data:</td>
                     <td><%= f.file_field :input_file %></td>
                   <tr>
                     <td colspan="2">
                       <%= submit_tag 'submit' %>
                     </td>
                   </tr>
                 </table>
               <% end %>
+            + </div>
               <h3>Previous requests</h3>
               <table class="info">
                 <tr class="info-head">
                   <th>at</th>
                   <th>problem</th>
                   <th>sub #</th>
                   <th>status</th>
                   <th>output (first 2kb)</th>
                   <th>compiler message</th>
                   <th>detail</th>

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

r86:9bdacfc7b6d7 - Sat, 12 Apr 2008 09:03:12 - 3 files changed: 26 inserted, 9 deleted

Sign in to your account

Commit r86:9bdacfc7b6d7 public

Author

r86:9bdacfc7b6d7 - Sat, 12 Apr 2008 09:03:12 - 3 files changed: 26 inserted, 9 deleted

Commit `r86:9bdacfc7b6d7` public