Invalid achievement conditions no longer show up as viable choices

Coursemology · Jul 15, 2015 · 6e33aa7 · 6e33aa7
1 parent 76a8365
commit 6e33aa7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/controllers/course/controller.rb b/app/controllers/course/controller.rb
@@ -38,6 +38,20 @@ def current_component_host
                                                           self)
   end
 
+  # Given an achievement, returns all valid achievement conditions it may depend on.
+  #
+  # @param [Course::Achievement] conditional The conditional for which to return conditions.
+  # @return [Array<Course::Achievement>]
+  def valid_achievement_conditions(conditional)
+    Course::Achievement.all -
+      [conditional] -
+      conditional.
+        specific_conditions.
+        select { |c| c.is_a?(Course::Condition::Achievement) }.
+        map(&:achievement)
+  end
+  helper_method :valid_achievement_conditions
+
   private
 
   # Selects sidebar items of the given type.

diff --git a/app/views/course/condition/achievements/_form.html.slim b/app/views/course/condition/achievements/_form.html.slim
@@ -2,6 +2,6 @@
                   resource: :course_achievement_condition_achievement do |f|
   = f.error_notification
   = f.error :course_achievement_condition_achievement
-  = f.input :achievement_id, collection: Course::Achievement.all
+  = f.input :achievement_id, collection: valid_achievement_conditions(@conditional)
 
   = f.button :submit