cafe-grader-web Commit - r364:9bd14bb6e95d

cafe-grader-web

Commit `r364:9bd14bb6e95d` public

parent | child

Description:

add option to update PDF file of a problem in /problem/edit/:id (grafted from 15b2554bf365f8639b5e94db4f1d9a277007808a)

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

r364:9bd14bb6e95d - Mon, 22 Sep 2014 15:46:06 - 3 files changed: 25 inserted, 1 deleted

app/controllers/problems_controller.rb ¶ +22

               class ProblemsController < ApplicationController
                 before_filter :authenticate, :authorization
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                 in_place_edit_for :problem, :full_score
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :quick_create,
                                                     :do_manage,
                                                     :do_import,
                                                     :update ],
                        :redirect_to => { :action => :list }
                 def list
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
                   @description = nil
                 end
                 def create
                   @problem = Problem.new(params[:problem])
                   @description = Description.new(params[:description])
                   if @description.body!=''
                     if !@description.save
                       render :action => new and return
                     end
                   else
                     @description = nil
                   end
                   @problem.description = @description
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def quick_create
                   @problem = Problem.new(params[:problem])
                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     flash[:notice] = 'Error saving problem'
                     redirect_to :action => 'list'
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description == nil and params[:description][:body]!=''
                     @description = Description.new(params[:description])
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description!=nil
                     if !@description.update_attributes(params[:description])
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
+            +     if params[:file] and params[:file].content_type != 'application/pdf'
+            +         flash[:notice] = 'Error: Uploaded file is not PDF'
+            +         render :action => 'edit' and return
+            +     end
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
+            +       unless params[:file] == nil or params[:file] == ''
+            +         flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.'
+            +         out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
+            +         if not FileTest.exists? out_dirname
+            +           Dir.mkdir out_dirname
+            +         end
+            +
+            +         out_filename = "#{out_dirname}/#{@problem.name}.pdf"
+            +         if FileTest.exists? out_filename
+            +           File.delete out_filename
+            +         end
+            +
+            +         File.open(out_filename,"wb") do |file|
+            +           file.write(params[:file].read)
+            +         end
+            +         @problem.description_filename = "#{@problem.name}.pdf"
+            +         @problem.save
+            +       end
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def toggle
                   @problem = Problem.find(params[:id])
                   @problem.available = !(@problem.available)
                   @problem.save
                 end
                 def turn_all_off
                   Problem.find(:all,
                                :conditions => "available = 1").each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def turn_all_on
                   Problem.find(:all,
                                :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   if !@problem.available
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @submissions = Submission.find_all_last_by_problem(params[:id])
                   end
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   else params.has_key? 'add_to_contest'
                     add_to_contest
                   end
                   redirect_to :action => 'manage'
                 end
                 def import
                   @allow_test_pair_import = allow_test_pair_import?
                 end
                 def do_import
                   old_problem = Problem.find_by_name(params[:name])
                   if !allow_test_pair_import? and params.has_key? :import_to_db
                     params.delete :import_to_db
                   end
                   @problem, import_log = Problem.create_from_import_form_params(params,
                                                                                 old_problem)
                   if !@problem.errors.empty?
                     render :action => 'import' and return
                   end
                   if old_problem!=nil
                     flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
                   end
                   @log = import_log
                 end
                 def remove_contest
                   problem = Problem.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if problem!=nil and contest!=nil
                     problem.contests.delete(contest)
                   end
                   redirect_to :action => 'manage'
                 end
                 ##################################
                 protected
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT
                   else
                     return false

app/views/problems/_form.html.erb ¶ +2

               <%= error_messages_for 'problem' %>
               <!--[form:problem]-->
               <p><label for="problem_name">Name</label><br/>
               <%= text_field 'problem', 'name'  %></p>
               <p><label for="problem_full_name">Full name</label><br/>
               <%= text_field 'problem', 'full_name'  %></p>
               <p><label for="problem_full_score">Full score</label><br/>
               <%= text_field 'problem', 'full_score'  %></p>
               <p><label for="problem_date_added">Date added</label><br/>
               <%= date_select 'problem', 'date_added'  %></p>
               <%
               # TODO: these should be put in model Problem, but I can't think of
               #       nice default values for them.  These values look fine only
               #       in this case (of lazily adding new problems).
               @problem.available = true if @problem!=nil and @problem.available==nil
               @problem.test_allowed = true if @problem!=nil and @problem.test_allowed==nil
               @problem.output_only = false if @problem!=nil and @problem.output_only==nil
               %>
               <p>
               <label for="problem_available">Available?</label>
               <%= check_box :problem, :available %>
               <label for="problem_test_allowed">Test allowed?</label>
               <%= check_box :problem, :test_allowed %>
               <label for="problem_output_only">Output only?</label>
               <%= check_box :problem, :output_only %>
               </p>
               <%= error_messages_for 'description' %>
               <p><label for="description_body">Description</label><br/>
               <%= text_area :description, :body, :rows => 10, :cols => 80  %></p>
               <p><label for="description_markdowned">Markdowned?</label>
               <%= select "description",
                          "markdowned",
                          [['True',true],['False',false]],
                          {:selected => (@description) ? @description.markdowned : false }
               %></p>
               <p><label for="problem_url">URL</label><br/>
               <%= text_field 'problem', 'url'  %></p>
+            + <p>Task PDF <%= file_field_tag 'file' %></p>
+            +
               <!--[eoform:problem]-->

app/views/problems/edit.html.erb ¶ +1 -1

               <h1>Editing problem</h1>
-            - <%= form_tag :action => 'update', :id => @problem do %>
+            + <%= form_tag({action: 'update', id: @problem},multipart: true) do %>
                 <%= render :partial => 'form' %>
                 <%= submit_tag 'Edit' %>
               <% end %>
               <%= link_to 'Show', :action => 'show', :id => @problem %> |
               <%= link_to 'Back', :action => 'list' %>

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

r364:9bd14bb6e95d - Mon, 22 Sep 2014 15:46:06 - 3 files changed: 25 inserted, 1 deleted

Sign in to your account

Commit r364:9bd14bb6e95d public

Author

r364:9bd14bb6e95d - Mon, 22 Sep 2014 15:46:06 - 3 files changed: 25 inserted, 1 deleted

Commit `r364:9bd14bb6e95d` public