cafe-grader-web

Commit r687:0c1baca84cbc public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge java
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r687:0c1baca84cbc - - 1 file changed: 2 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -299,51 +299,51
299 299 else
300 300 contest_problems = []
301 301 pin = {}
302 302 contests.enabled.each do |contest|
303 303 contest.problems.available.each do |problem|
304 304 if not pin.has_key? problem.id
305 305 contest_problems << problem
306 306 end
307 307 pin[problem.id] = true
308 308 end
309 309 end
310 310 other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
311 311 return contest_problems + other_avaiable_problems
312 312 end
313 313 end
314 314
315 315 def available_problems_in_group
316 316 problem = []
317 317 self.groups.each do |group|
318 318 group.problems.where(available: true).each { |p| problem << p }
319 319 end
320 320 problem.uniq!.sort! do |a,b|
321 321 case
322 322 when a.date_added < b.date_added
323 - -1
323 + 1
324 324 when a.date_added > b.date_added
325 - 1
325 + -1
326 326 else
327 327 a.name <=> b.name
328 328 end
329 329 end
330 330 return problem
331 331 end
332 332
333 333 def can_view_problem?(problem)
334 334 if not GraderConfiguration.multicontests?
335 335 return problem.available
336 336 else
337 337 return problem_in_user_contests? problem
338 338 end
339 339 end
340 340
341 341 def self.clear_last_login
342 342 User.update_all(:last_ip => nil)
343 343 end
344 344
345 345 protected
346 346 def encrypt_new_password
347 347 return if password.blank?
348 348 self.salt = (10+rand(90)).to_s
349 349 self.hashed_password = User.encrypt(self.password,self.salt)
You need to be logged in to leave comments. Login now