Description:
revert simple_form_for to form_tag
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r758:d23edd5adc06 - - 5 files changed: 11 inserted, 30 deleted
| @@ -94,7 +94,6 | |||||
|
|
94 | coffee-script-source (1.12.2) |
|
94 | coffee-script-source (1.12.2) |
|
|
95 | concurrent-ruby (1.1.5) |
|
95 | concurrent-ruby (1.1.5) |
|
|
96 | crass (1.0.4) |
|
96 | crass (1.0.4) |
|
|
97 | - diff-lcs (1.3) |
|
||
|
|
98 | dynamic_form (1.1.4) |
|
97 | dynamic_form (1.1.4) |
|
|
99 | erubi (1.8.0) |
|
98 | erubi (1.8.0) |
|
|
100 | erubis (2.7.0) |
|
99 | erubis (2.7.0) |
| @@ -211,23 +210,6 | |||||
|
|
211 | rdiscount (2.2.0.1) |
|
210 | rdiscount (2.2.0.1) |
|
|
212 | regexp_parser (1.5.1) |
|
211 | regexp_parser (1.5.1) |
|
|
213 | rouge (3.3.0) |
|
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 | ruby-progressbar (1.10.0) |
|
213 | ruby-progressbar (1.10.0) |
|
|
232 | ruby_dep (1.5.0) |
|
214 | ruby_dep (1.5.0) |
|
|
233 | ruby_parser (3.13.1) |
|
215 | ruby_parser (3.13.1) |
| @@ -338,7 +320,6 | |||||
|
|
338 | rails_bootstrap_sortable |
|
320 | rails_bootstrap_sortable |
|
|
339 | rdiscount |
|
321 | rdiscount |
|
|
340 | rouge |
|
322 | rouge |
|
|
341 | - rspec-rails |
|
||
|
|
342 | sassc-rails |
|
323 | sassc-rails |
|
|
343 | select2-rails |
|
324 | select2-rails |
|
|
344 | selenium-webdriver |
|
325 | selenium-webdriver |
| @@ -31,7 +31,7 | |||||
|
|
31 |
|
31 | ||
|
|
32 | def self.create_from_import_form_params(params, old_problem=nil) |
|
32 | def self.create_from_import_form_params(params, old_problem=nil) |
|
|
33 | org_problem = old_problem || Problem.new |
|
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 | org_problem) |
|
35 | org_problem) |
|
|
36 |
|
36 | ||
|
|
37 | if !problem.errors.empty? |
|
37 | if !problem.errors.empty? |
| @@ -52,8 +52,8 | |||||
|
|
52 |
|
52 | ||
|
|
53 | importer = TestdataImporter.new(problem) |
|
53 | importer = TestdataImporter.new(problem) |
|
|
54 |
|
54 | ||
|
|
55 |
- if not importer.import_from_file(import_params[:file], |
|
55 | + if not importer.import_from_file(import_params[:file], |
|
|
56 |
- import_params[:time_limit], |
|
56 | + import_params[:time_limit], |
|
|
57 | import_params[:memory_limit], |
|
57 | import_params[:memory_limit], |
|
|
58 | import_params[:checker_name], |
|
58 | import_params[:checker_name], |
|
|
59 | import_to_db) |
|
59 | import_to_db) |
| @@ -8,7 +8,7 | |||||
|
|
8 | - if @problem and @problem.errors |
|
8 | - if @problem and @problem.errors |
|
|
9 | =error_messages_for 'problem' |
|
9 | =error_messages_for 'problem' |
|
|
10 |
|
10 | ||
|
|
11 |
- = |
|
11 | + = form_tag do_import_problems_path, :multipart => true do |f| |
|
|
12 |
|
12 | ||
|
|
13 | .submitbox |
|
13 | .submitbox |
|
|
14 | %table |
|
14 | %table |
| @@ -267,12 +267,12 | |||||
|
|
267 |
|
267 | ||
|
|
268 | def seed_more_languages |
|
268 | def seed_more_languages |
|
|
269 | Language.delete_all |
|
269 | Language.delete_all |
|
|
270 | - Language.create( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' ) |
|
270 | + Language.find_or_create_by( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' ) |
|
|
271 | - Language.create( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' ) |
|
271 | + Language.find_or_create_by( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' ) |
|
|
272 | - Language.create( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' ) |
|
272 | + Language.find_or_create_by( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' ) |
|
|
273 | - Language.create( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' ) |
|
273 | + Language.find_or_create_by( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' ) |
|
|
274 | - Language.create( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' ) |
|
274 | + Language.find_or_create_by( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' ) |
|
|
275 | - Language.create( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' ) |
|
275 | + Language.find_or_create_by( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' ) |
|
|
276 | end |
|
276 | end |
|
|
277 |
|
277 | ||
|
|
278 | seed_config |
|
278 | seed_config |
| @@ -94,7 +94,7 | |||||
|
|
94 | testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}") |
|
94 | testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}") |
|
|
95 |
|
95 | ||
|
|
96 | return nil if tempfile=="" |
|
96 | return nil if tempfile=="" |
|
|
97 | - |
|
97 | + |
|
|
98 | if tempfile.instance_of?(Tempfile) |
|
98 | if tempfile.instance_of?(Tempfile) |
|
|
99 | tempfile.close |
|
99 | tempfile.close |
|
|
100 | FileUtils.move(tempfile.path,testdata_filename) |
|
100 | FileUtils.move(tempfile.path,testdata_filename) |
You need to be logged in to leave comments.
Login now