Description:
Change to better error message when the submitted file has illegal extension
Solve issue #4
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r548:ba97cbe38d86 - - 1 file changed: 1 inserted, 1 deleted
| @@ -129,45 +129,45 | |||||
|
|
129 | begin |
|
129 | begin |
|
|
130 | self.problem = Problem.find(self.problem_id) |
|
130 | self.problem = Problem.find(self.problem_id) |
|
|
131 | rescue ActiveRecord::RecordNotFound |
|
131 | rescue ActiveRecord::RecordNotFound |
|
|
132 | self.problem = nil |
|
132 | self.problem = nil |
|
|
133 | end |
|
133 | end |
|
|
134 | else |
|
134 | else |
|
|
135 | self.problem = Submission.find_problem_in_source(self.source, |
|
135 | self.problem = Submission.find_problem_in_source(self.source, |
|
|
136 | self.source_filename) |
|
136 | self.source_filename) |
|
|
137 | end |
|
137 | end |
|
|
138 | end |
|
138 | end |
|
|
139 |
|
139 | ||
|
|
140 | def assign_language |
|
140 | def assign_language |
|
|
141 | self.language = Submission.find_language_in_source(self.source, |
|
141 | self.language = Submission.find_language_in_source(self.source, |
|
|
142 | self.source_filename) |
|
142 | self.source_filename) |
|
|
143 | end |
|
143 | end |
|
|
144 |
|
144 | ||
|
|
145 | # validation codes |
|
145 | # validation codes |
|
|
146 | def must_specify_language |
|
146 | def must_specify_language |
|
|
147 | return if self.source==nil |
|
147 | return if self.source==nil |
|
|
148 |
|
148 | ||
|
|
149 | # for output_only tasks |
|
149 | # for output_only tasks |
|
|
150 | return if self.problem!=nil and self.problem.output_only |
|
150 | return if self.problem!=nil and self.problem.output_only |
|
|
151 |
|
151 | ||
|
|
152 | if self.language==nil |
|
152 | if self.language==nil |
|
|
153 |
- errors.add('source'," |
|
153 | + errors.add('source',"Cannot detect language. Did you submit a correct source file?") unless self.language!=nil |
|
|
154 | end |
|
154 | end |
|
|
155 | end |
|
155 | end |
|
|
156 |
|
156 | ||
|
|
157 | def must_have_valid_problem |
|
157 | def must_have_valid_problem |
|
|
158 | return if self.source==nil |
|
158 | return if self.source==nil |
|
|
159 | if self.problem==nil |
|
159 | if self.problem==nil |
|
|
160 | errors.add('problem',"must be specified.") |
|
160 | errors.add('problem',"must be specified.") |
|
|
161 | elsif (!self.problem.available) and (self.new_record?) |
|
161 | elsif (!self.problem.available) and (self.new_record?) |
|
|
162 | errors.add('problem',"must be valid.") |
|
162 | errors.add('problem',"must be valid.") |
|
|
163 | end |
|
163 | end |
|
|
164 | end |
|
164 | end |
|
|
165 |
|
165 | ||
|
|
166 | # callbacks |
|
166 | # callbacks |
|
|
167 | def assign_latest_number_if_new_recond |
|
167 | def assign_latest_number_if_new_recond |
|
|
168 | return if !self.new_record? |
|
168 | return if !self.new_record? |
|
|
169 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
169 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
|
170 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
170 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
|
171 | end |
|
171 | end |
|
|
172 |
|
172 | ||
|
|
173 | end |
|
173 | end |
You need to be logged in to leave comments.
Login now