Merge branch 'release/0.14.8.4'

ulmic · Mar 9, 2017 · d798472 · d798472
2 parents f577138 + 8cbfb7a
commit d798472
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/app/models/activity_lines/lider/ya_lider/stage.rb b/app/models/activity_lines/lider/ya_lider/stage.rb
@@ -21,12 +21,16 @@ class ActivityLines::Lider::YaLider::Stage < ActiveRecord::Base
   end
 
   def next_stage
-    contest.stages.where(number: number + 1).first
+    @next_stage ||= contest.stages.where(number: number + 1).first
   end
 
   def current_participants
-    participants.active.map do |participant|
-      participant unless participant.participations.active.where(stage_id: next_stage.id).any?
-    end.compact.map &:decorate
+    if next_stage.present?
+      @participants ||= participants.active.map do |participant|
+        participant unless participant.participations.active.where(stage_id: next_stage.id).any?
+      end.compact.map(&:decorate)
+    else
+      []
+    end
   end
 end