From 5106bd5390a002136a98a973e5c22d97ba999f89 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Mon, 2 Nov 2015 12:35:28 -0800
Subject: [PATCH] Fix sortThangComponents corner case in course levels with
 Plans attaching twice

Fixes https://app.asana.com/0/54276215890539/62515742172177/f
---
 app/models/Level.coffee | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/models/Level.coffee b/app/models/Level.coffee
index b32aa35b2..5afdcbb36 100644
--- a/app/models/Level.coffee
+++ b/app/models/Level.coffee
@@ -164,22 +164,19 @@ module.exports = class Level extends CocoModel
     # TODO: anything that depends on Programmable will break right now.
 
     for thang in thangs ? []
-      programmableLevelComponent = null
-      plansLevelComponent = null
       sorted = []
-      visit = (c) ->
+      visit = (c, namesToIgnore) ->
         return if c in sorted
         lc = _.find levelComponents, {original: c.original}
         console.error thang.id or thang.name, 'couldn\'t find lc for', c, 'of', levelComponents unless lc
         return unless lc
+        return if namesToIgnore and lc.name in namesToIgnore
         if lc.name is 'Plans'
           # Plans always comes second-to-last, behind Programmable
-          plansLevelComponent = c
-          visit c2 for c2 in _.without thang.components, c, programmableLevelComponent
+          visit c2, [lc.name, 'Programmable'] for c2 in thang.components
         else if lc.name is 'Programmable'
           # Programmable always comes last
-          programmableLevelComponent = c
-          visit c2 for c2 in _.without thang.components, c
+          visit c2, [lc.name] for c2 in thang.components
         else
           for d in lc.dependencies or []
             c2 = _.find thang.components, {original: d.original}