cafe-grader-web Commit - r634:56cf4357ce2a

cafe-grader-web

parent | child

Description:

- fix pdf loading fail

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r634:56cf4357ce2a - Wed, 25 Jan 2017 07:43:00 - 4 files changed: 11 inserted, 4 deleted

app/controllers/problems_controller.rb ¶ +7 -1

                     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])
+            +     if @problem.update_attributes(problem_params)
                     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
                   problems
                 end
                 def get_problems_stat
                 end
+            +   private
+            +
+            +     def problem_params
+            +       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description)
               end
+            +
+            + end

app/controllers/user_admin_controller.rb ¶ +1 -1

                         note << "'#{login}' (+)"
                       else
                         note << login
                       end
                     end
                   end
-            -     flash[:notice] = 'User(s) ' + note.join(', ') +
+            +     flash[:success] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
                   redirect_to :action => 'index'
                 end
                 def edit

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

               <%= error_messages_for 'problem' %>
               <!--[form:problem]-->
               <p><label for="problem_name">Name</label><br/>
-            - <%= text_field 'problem', 'name'  %></p>
+            + <%= text_field 'problem', 'name'  %> Do not directly edit the problem name, unless you know what you are doing. If you want to change the name, use the name change button in the problem management menu instead.
+            + </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>

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

                 <% else %>
                   (not available)
                 <% end %>
               </p>
               <%= link_to 'Edit', :action => 'edit', :id => @problem %> |
-            - <%= link_to 'Back', :action => 'list' %>
+            + <%= link_to 'Back', problems_path %>

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

	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