cafe-grader-web Commit - r688:b31aedc6a96e

cafe-grader-web

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r688:b31aedc6a96e - Mon, 11 Sep 2017 16:50:14 - 1 file changed: 6 inserted, 1 deleted

app/models/user.rb ¶ +6 -1

                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
                 def available_problems_in_group
                   problem = []
                   self.groups.each do |group|
                     group.problems.where(available: true).each { |p| problem << p }
                   end
-            -     problem.uniq!.sort! do |a,b|
+            +     problem.uniq!
+            +     if problem
+            +       problem.sort! do |a,b|
                     case
                     when a.date_added < b.date_added
 
                     when a.date_added > b.date_added
                       -1
                     else
                       a.name <=> b.name
                     end
                   end
                   return problem
+            +     else
+            +       return []
+            +     end
                 end
                 def can_view_problem?(problem)
                   if not GraderConfiguration.multicontests?
                     return problem.available
                   else
                     return problem_in_user_contests? problem
                   end
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings