Description:
[web] fix problem availability bug
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@155 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
jittat
-
r75:8466e8e886f1 - - 1 file changed: 1 inserted, 1 deleted
| @@ -92,39 +92,39 | |||||
|
|
92 | prob_opt = find_option_in_source(/^TASK:/,source) |
|
92 | prob_opt = find_option_in_source(/^TASK:/,source) |
|
|
93 | if problem = Problem.find_by_name(prob_opt) |
|
93 | if problem = Problem.find_by_name(prob_opt) |
|
|
94 | return problem |
|
94 | return problem |
|
|
95 | else |
|
95 | else |
|
|
96 | return nil |
|
96 | return nil |
|
|
97 | end |
|
97 | end |
|
|
98 | end |
|
98 | end |
|
|
99 |
|
99 | ||
|
|
100 | # validation codes |
|
100 | # validation codes |
|
|
101 | def must_specify_language |
|
101 | def must_specify_language |
|
|
102 | return if self.source==nil |
|
102 | return if self.source==nil |
|
|
103 | self.language = Submission.find_language_in_source(self.source) |
|
103 | self.language = Submission.find_language_in_source(self.source) |
|
|
104 | errors.add_to_base("must specify programming language") unless self.language!=nil |
|
104 | errors.add_to_base("must specify programming language") unless self.language!=nil |
|
|
105 | end |
|
105 | end |
|
|
106 |
|
106 | ||
|
|
107 | def must_have_valid_problem |
|
107 | def must_have_valid_problem |
|
|
108 | return if self.source==nil |
|
108 | return if self.source==nil |
|
|
109 | if self.problem_id!=-1 |
|
109 | if self.problem_id!=-1 |
|
|
110 | problem = Problem.find(self.problem_id) |
|
110 | problem = Problem.find(self.problem_id) |
|
|
111 | else |
|
111 | else |
|
|
112 | problem = Submission.find_problem_in_source(self.source) |
|
112 | problem = Submission.find_problem_in_source(self.source) |
|
|
113 | end |
|
113 | end |
|
|
114 | if problem==nil |
|
114 | if problem==nil |
|
|
115 | errors.add_to_base("must specify problem") |
|
115 | errors.add_to_base("must specify problem") |
|
|
116 | - elsif !problem.available |
|
116 | + elsif (!problem.available) and (self.new_record?) |
|
|
117 | errors.add_to_base("must specify valid problem") |
|
117 | errors.add_to_base("must specify valid problem") |
|
|
118 | else |
|
118 | else |
|
|
119 | self.problem = problem |
|
119 | self.problem = problem |
|
|
120 | end |
|
120 | end |
|
|
121 | end |
|
121 | end |
|
|
122 |
|
122 | ||
|
|
123 | # callbacks |
|
123 | # callbacks |
|
|
124 | def assign_latest_number_if_new_recond |
|
124 | def assign_latest_number_if_new_recond |
|
|
125 | return if !self.new_record? |
|
125 | return if !self.new_record? |
|
|
126 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
126 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
|
127 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
127 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
|
128 | end |
|
128 | end |
|
|
129 |
|
129 | ||
|
|
130 | end |
|
130 | end |
You need to be logged in to leave comments.
Login now