Merge branch 'release/0.12.0.2'

ulmic · Jan 19, 2017 · f4ccf47 · f4ccf47
2 parents a6a3913 + dd3c3bc
commit f4ccf47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/activity_lines/lider/ya_lider/stage.rb b/app/models/activity_lines/lider/ya_lider/stage.rb
@@ -24,7 +24,7 @@ def next_stage
 
   def current_participants
     participants.active.map do |participant|
-      participant unless participant.participations.where(stage_id: next_stage.id).any?
+      participant unless participant.participations.active.where(stage_id: next_stage.id).any?
     end.compact.map &:decorate
   end
 end
diff --git a/app/scopes/activity_lines/lider/ya_lider/participant_scopes.rb b/app/scopes/activity_lines/lider/ya_lider/participant_scopes.rb
@@ -0,0 +1,6 @@
+require 'scopes_rails/state_machine/scopes'
+
+module ActivityLines::Lider::YaLider::ParticipantScopes
+  extend ActiveSupport::Concern
+  include StateMachine::Scopes
+end