Merge branch 'develop'

tylergannon · Mar 4, 2013 · 65138a2 · 65138a2
2 parents 11f09c1 + 1ff8c71
commit 65138a2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/models/chart_palace_list.rb b/app/models/chart_palace_list.rb
@@ -4,14 +4,14 @@ def self.build_with_ming(chart, ming_branch)
     location = ming_branch
 
     (1..12).each do |i|
-      arr << ChartPalace.new(palace: Palace.send("_#{i}"), location: location)
+      arr << ChartPalace.new(palace: Palace.send("_#{i}"), location: location, chart: chart)
       location = location.previous
     end
     arr = ChartPalaceList.new(arr)
 
-    Star.all.each do |star|
-      arr.by_location(chart.send(star.symbol_name)).stars << star
-    end
+    # Star.all.each do |star|
+    #   arr.by_location(chart.send(star.symbol_name)).stars << star
+    # end
     arr
   end