cafe-grader-web

Commit r338:0d4a8ccf5805 public

parent | child
Description:
uses empty? instead of length to check model validation errors when importing problems
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r338:0d4a8ccf5805 - - 2 files changed: 3 inserted, 3 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -151,25 +151,25
151 def import
151 def import
152 @allow_test_pair_import = allow_test_pair_import?
152 @allow_test_pair_import = allow_test_pair_import?
153 end
153 end
154
154
155 def do_import
155 def do_import
156 old_problem = Problem.find_by_name(params[:name])
156 old_problem = Problem.find_by_name(params[:name])
157 if !allow_test_pair_import? and params.has_key? :import_to_db
157 if !allow_test_pair_import? and params.has_key? :import_to_db
158 params.delete :import_to_db
158 params.delete :import_to_db
159 end
159 end
160 @problem, import_log = Problem.create_from_import_form_params(params,
160 @problem, import_log = Problem.create_from_import_form_params(params,
161 old_problem)
161 old_problem)
162
162
163 - if @problem.errors.length != 0
163 + if !@problem.errors.empty?
164 render :action => 'import' and return
164 render :action => 'import' and return
165 end
165 end
166
166
167 if old_problem!=nil
167 if old_problem!=nil
168 flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
168 flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
169 end
169 end
170 @log = import_log
170 @log = import_log
171 end
171 end
172
172
173 def remove_contest
173 def remove_contest
174 problem = Problem.find(params[:id])
174 problem = Problem.find(params[:id])
175 contest = Contest.find(params[:contest_id])
175 contest = Contest.find(params[:contest_id])
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -13,25 +13,25
13 DEFAULT_TIME_LIMIT = 1
13 DEFAULT_TIME_LIMIT = 1
14 DEFAULT_MEMORY_LIMIT = 32
14 DEFAULT_MEMORY_LIMIT = 32
15
15
16 def self.find_available_problems
16 def self.find_available_problems
17 Problem.available.all(:order => "date_added DESC")
17 Problem.available.all(:order => "date_added DESC")
18 end
18 end
19
19
20 def self.create_from_import_form_params(params, old_problem=nil)
20 def self.create_from_import_form_params(params, old_problem=nil)
21 org_problem = old_problem || Problem.new
21 org_problem = old_problem || Problem.new
22 import_params, problem = Problem.extract_params_and_check(params,
22 import_params, problem = Problem.extract_params_and_check(params,
23 org_problem)
23 org_problem)
24
24
25 - if problem.errors.length!=0
25 + if !problem.errors.empty?
26 return problem, 'Error importing'
26 return problem, 'Error importing'
27 end
27 end
28
28
29 problem.full_score = 100
29 problem.full_score = 100
30 problem.date_added = Time.new
30 problem.date_added = Time.new
31 problem.test_allowed = true
31 problem.test_allowed = true
32 problem.output_only = false
32 problem.output_only = false
33 problem.available = false
33 problem.available = false
34
34
35 if not problem.save
35 if not problem.save
36 return problem, 'Error importing'
36 return problem, 'Error importing'
37 end
37 end
@@ -83,25 +83,25
83 if memory_limit==0 and params[:memory_limit]!='0'
83 if memory_limit==0 and params[:memory_limit]!='0'
84 problem.errors.add_to_base('Memory limit format errors.')
84 problem.errors.add_to_base('Memory limit format errors.')
85 elsif memory_limit<=0 or memory_limit >512
85 elsif memory_limit<=0 or memory_limit >512
86 problem.errors.add_to_base('Memory limit out of range.')
86 problem.errors.add_to_base('Memory limit out of range.')
87 end
87 end
88
88
89 if params[:file]==nil or params[:file]==''
89 if params[:file]==nil or params[:file]==''
90 problem.errors.add_to_base('No testdata file.')
90 problem.errors.add_to_base('No testdata file.')
91 end
91 end
92
92
93 file = params[:file]
93 file = params[:file]
94
94
95 - if problem.errors.length!=0
95 + if !problem.errors.empty?
96 return nil, problem
96 return nil, problem
97 end
97 end
98
98
99 problem.name = params[:name]
99 problem.name = params[:name]
100 if params[:full_name]!=''
100 if params[:full_name]!=''
101 problem.full_name = params[:full_name]
101 problem.full_name = params[:full_name]
102 else
102 else
103 problem.full_name = params[:name]
103 problem.full_name = params[:name]
104 end
104 end
105
105
106 return [{
106 return [{
107 :time_limit => time_limit,
107 :time_limit => time_limit,
You need to be logged in to leave comments. Login now