cafe-grader-web

Commit r758:d23edd5adc06 public

parent | child
Description:
revert simple_form_for to form_tag
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r758:d23edd5adc06 - - 5 files changed: 11 inserted, 30 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -94,7 +94,6
94 94 coffee-script-source (1.12.2)
95 95 concurrent-ruby (1.1.5)
96 96 crass (1.0.4)
97 - diff-lcs (1.3)
98 97 dynamic_form (1.1.4)
99 98 erubi (1.8.0)
100 99 erubis (2.7.0)
@@ -211,23 +210,6
211 210 rdiscount (2.2.0.1)
212 211 regexp_parser (1.5.1)
213 212 rouge (3.3.0)
214 - rspec-core (3.8.2)
215 - rspec-support (~> 3.8.0)
216 - rspec-expectations (3.8.4)
217 - diff-lcs (>= 1.2.0, < 2.0)
218 - rspec-support (~> 3.8.0)
219 - rspec-mocks (3.8.1)
220 - diff-lcs (>= 1.2.0, < 2.0)
221 - rspec-support (~> 3.8.0)
222 - rspec-rails (3.8.2)
223 - actionpack (>= 3.0)
224 - activesupport (>= 3.0)
225 - railties (>= 3.0)
226 - rspec-core (~> 3.8.0)
227 - rspec-expectations (~> 3.8.0)
228 - rspec-mocks (~> 3.8.0)
229 - rspec-support (~> 3.8.0)
230 - rspec-support (3.8.2)
231 213 ruby-progressbar (1.10.0)
232 214 ruby_dep (1.5.0)
233 215 ruby_parser (3.13.1)
@@ -338,7 +320,6
338 320 rails_bootstrap_sortable
339 321 rdiscount
340 322 rouge
341 - rspec-rails
342 323 sassc-rails
343 324 select2-rails
344 325 selenium-webdriver
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -31,7 +31,7
31 31
32 32 def self.create_from_import_form_params(params, old_problem=nil)
33 33 org_problem = old_problem || Problem.new
34 - import_params, problem = Problem.extract_params_and_check(params,
34 + import_params, problem = Problem.extract_params_and_check(params,
35 35 org_problem)
36 36
37 37 if !problem.errors.empty?
@@ -52,8 +52,8
52 52
53 53 importer = TestdataImporter.new(problem)
54 54
55 - if not importer.import_from_file(import_params[:file],
56 - import_params[:time_limit],
55 + if not importer.import_from_file(import_params[:file],
56 + import_params[:time_limit],
57 57 import_params[:memory_limit],
58 58 import_params[:checker_name],
59 59 import_to_db)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -8,7 +8,7
8 8 - if @problem and @problem.errors
9 9 =error_messages_for 'problem'
10 10
11 - = simple_form_for :problem, url: do_import_problems_path, :multipart => true do |f|
11 + = form_tag do_import_problems_path, :multipart => true do |f|
12 12
13 13 .submitbox
14 14 %table
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -267,12 +267,12
267 267
268 268 def seed_more_languages
269 269 Language.delete_all
270 - Language.create( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' )
271 - Language.create( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' )
272 - Language.create( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' )
273 - Language.create( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' )
274 - Language.create( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' )
275 - Language.create( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' )
270 + Language.find_or_create_by( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' )
271 + Language.find_or_create_by( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' )
272 + Language.find_or_create_by( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' )
273 + Language.find_or_create_by( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' )
274 + Language.find_or_create_by( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' )
275 + Language.find_or_create_by( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' )
276 276 end
277 277
278 278 seed_config
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -94,7 +94,7
94 94 testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}")
95 95
96 96 return nil if tempfile==""
97 -
97 +
98 98 if tempfile.instance_of?(Tempfile)
99 99 tempfile.close
100 100 FileUtils.move(tempfile.path,testdata_filename)
You need to be logged in to leave comments. Login now