fix edit structure

wagn · Jan 5, 2017 · 1bdc6be · 1bdc6be
1 parent 196d061
commit 1bdc6be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/card/lib/card/subcards.rb b/card/lib/card/subcards.rb
@@ -251,7 +251,7 @@ def new_by_attributes name, attributes={}
          (absolute_name.parts.size - @context_card.cardname.parts.size) > 2
         left_card = new_by_attributes absolute_name.left
         new_by_card left_card, transact_in_stage: attributes[:transact_in_stage]
-        left_card.new_by_attributes absolute_name, attributes
+        left_card.subcards.new_by_attributes absolute_name, attributes
       else
         subcard_args = extract_subcard_args! attributes
         t_i_s = attributes.delete(:transact_in_stage)

diff --git a/card/mod/core/set/all/collection.rb b/card/mod/core/set/all/collection.rb
@@ -228,10 +228,11 @@ def edit_fields
   end
 
   def normalized_edit_fields
-    edit_fields.map do |name, options|
-      options ||= Card.quick_fetch(name).name
+    edit_fields.map do |name_or_card, options|
+      next [name_or_card, options || {}] if name_or_card.is_a?(Card)
+      options ||= Card.fetch_name name_or_card
       options = { title: options } if options.is_a?(String)
-      [card.cardname.field(name), options]
+      [card.cardname.field(name_or_card), options]
     end
   end