# HG changeset patch # User Nattee Niparnan # Date 2017-09-11 16:49:34 # Node ID 23aeddbc469006f3de07cbe5a886889e2b769ab7 # Parent e66ec14a1b30cd6beecb9c44295fd59128dab6f8 fix sorting when avialable problem is nil diff --git a/app/models/user.rb b/app/models/user.rb --- a/app/models/user.rb +++ b/app/models/user.rb @@ -317,17 +317,22 @@ self.groups.each do |group| group.problems.where(available: true).each { |p| problem << p } end - problem.uniq!.sort! do |a,b| - case - when a.date_added < b.date_added - 1 - when a.date_added > b.date_added - -1 - else - a.name <=> b.name + problem.uniq! + if problem + problem.sort! do |a,b| + case + when a.date_added < b.date_added + 1 + when a.date_added > b.date_added + -1 + else + a.name <=> b.name + end end + return problem + else + return [] end - return problem end def can_view_problem?(problem)