cafe-grader-web

Commit r75:8466e8e886f1 public

parent | child
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:
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

r75:8466e8e886f1 - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -68,63 +68,63
68 68 if s =~ option
69 69 words = s.split
70 70 return words[1]
71 71 end
72 72 i = i + 1
73 73 if i==10
74 74 return nil
75 75 end
76 76 end
77 77 return nil
78 78 end
79 79
80 80 def self.find_language_in_source(source)
81 81 langopt = find_option_in_source(/^LANG:/,source)
82 82 if language = Language.find_by_name(langopt)
83 83 return language
84 84 elsif language = Language.find_by_pretty_name(langopt)
85 85 return language
86 86 else
87 87 return nil
88 88 end
89 89 end
90 90
91 91 def self.find_problem_in_source(source)
92 92 prob_opt = find_option_in_source(/^TASK:/,source)
93 93 if problem = Problem.find_by_name(prob_opt)
94 94 return problem
95 95 else
96 96 return nil
97 97 end
98 98 end
99 99
100 100 # validation codes
101 101 def must_specify_language
102 102 return if self.source==nil
103 103 self.language = Submission.find_language_in_source(self.source)
104 104 errors.add_to_base("must specify programming language") unless self.language!=nil
105 105 end
106 106
107 107 def must_have_valid_problem
108 108 return if self.source==nil
109 109 if self.problem_id!=-1
110 110 problem = Problem.find(self.problem_id)
111 111 else
112 112 problem = Submission.find_problem_in_source(self.source)
113 113 end
114 114 if problem==nil
115 115 errors.add_to_base("must specify problem")
116 - elsif !problem.available
116 + elsif (!problem.available) and (self.new_record?)
117 117 errors.add_to_base("must specify valid problem")
118 118 else
119 119 self.problem = problem
120 120 end
121 121 end
122 122
123 123 # callbacks
124 124 def assign_latest_number_if_new_recond
125 125 return if !self.new_record?
126 126 latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
127 127 self.number = (latest==nil) ? 1 : latest.number + 1;
128 128 end
129 129
130 130 end
You need to be logged in to leave comments. Login now