Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r688:b31aedc6a96e - - 1 file changed: 14 inserted, 9 deleted
| @@ -296,59 +296,64 | |||||
|
|
296 | else |
|
296 | else |
|
|
297 | return Problem.available_problems |
|
297 | return Problem.available_problems |
|
|
298 | end |
|
298 | end |
|
|
299 | else |
|
299 | else |
|
|
300 | contest_problems = [] |
|
300 | contest_problems = [] |
|
|
301 | pin = {} |
|
301 | pin = {} |
|
|
302 | contests.enabled.each do |contest| |
|
302 | contests.enabled.each do |contest| |
|
|
303 | contest.problems.available.each do |problem| |
|
303 | contest.problems.available.each do |problem| |
|
|
304 | if not pin.has_key? problem.id |
|
304 | if not pin.has_key? problem.id |
|
|
305 | contest_problems << problem |
|
305 | contest_problems << problem |
|
|
306 | end |
|
306 | end |
|
|
307 | pin[problem.id] = true |
|
307 | pin[problem.id] = true |
|
|
308 | end |
|
308 | end |
|
|
309 | end |
|
309 | end |
|
|
310 | other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0} |
|
310 | other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0} |
|
|
311 | return contest_problems + other_avaiable_problems |
|
311 | return contest_problems + other_avaiable_problems |
|
|
312 | end |
|
312 | end |
|
|
313 | end |
|
313 | end |
|
|
314 |
|
314 | ||
|
|
315 | def available_problems_in_group |
|
315 | def available_problems_in_group |
|
|
316 | problem = [] |
|
316 | problem = [] |
|
|
317 | self.groups.each do |group| |
|
317 | self.groups.each do |group| |
|
|
318 | group.problems.where(available: true).each { |p| problem << p } |
|
318 | group.problems.where(available: true).each { |p| problem << p } |
|
|
319 | end |
|
319 | end |
|
|
320 |
- problem.uniq! |
|
320 | + problem.uniq! |
|
|
321 | - case |
|
321 | + if problem |
|
|
322 | - when a.date_added < b.date_added |
|
322 | + problem.sort! do |a,b| |
|
|
323 |
- |
|
323 | + case |
|
|
324 |
- when a.date_added |
|
324 | + when a.date_added < b.date_added |
|
|
325 |
- |
|
325 | + 1 |
|
|
326 | - else |
|
326 | + when a.date_added > b.date_added |
|
|
327 | - a.name <=> b.name |
|
327 | + -1 |
|
|
|
328 | + else | ||
|
|
|
329 | + a.name <=> b.name | ||
|
|
|
330 | + end | ||
|
|
328 | end |
|
331 | end |
|
|
|
332 | + return problem | ||
|
|
|
333 | + else | ||
|
|
|
334 | + return [] | ||
|
|
329 | end |
|
335 | end |
|
|
330 | - return problem |
|
||
|
|
331 | end |
|
336 | end |
|
|
332 |
|
337 | ||
|
|
333 | def can_view_problem?(problem) |
|
338 | def can_view_problem?(problem) |
|
|
334 | if not GraderConfiguration.multicontests? |
|
339 | if not GraderConfiguration.multicontests? |
|
|
335 | return problem.available |
|
340 | return problem.available |
|
|
336 | else |
|
341 | else |
|
|
337 | return problem_in_user_contests? problem |
|
342 | return problem_in_user_contests? problem |
|
|
338 | end |
|
343 | end |
|
|
339 | end |
|
344 | end |
|
|
340 |
|
345 | ||
|
|
341 | def self.clear_last_login |
|
346 | def self.clear_last_login |
|
|
342 | User.update_all(:last_ip => nil) |
|
347 | User.update_all(:last_ip => nil) |
|
|
343 | end |
|
348 | end |
|
|
344 |
|
349 | ||
|
|
345 | protected |
|
350 | protected |
|
|
346 | def encrypt_new_password |
|
351 | def encrypt_new_password |
|
|
347 | return if password.blank? |
|
352 | return if password.blank? |
|
|
348 | self.salt = (10+rand(90)).to_s |
|
353 | self.salt = (10+rand(90)).to_s |
|
|
349 | self.hashed_password = User.encrypt(self.password,self.salt) |
|
354 | self.hashed_password = User.encrypt(self.password,self.salt) |
|
|
350 | end |
|
355 | end |
|
|
351 |
|
356 | ||
|
|
352 | def assign_default_site |
|
357 | def assign_default_site |
|
|
353 | # have to catch error when migrating (because self.site is not available). |
|
358 | # have to catch error when migrating (because self.site is not available). |
|
|
354 | begin |
|
359 | begin |
You need to be logged in to leave comments.
Login now