rename model name

[pettanr/pettanr.git] / app / assets / javascripts / manifest / model / association / has_many.js.coffee

diff --git a/app/assets/javascripts/manifest/model/association/has_many.js.coffee b/app/assets/javascripts/manifest/model/association/has_many.js.coffee
index acd065f..9478ea3 100644 (file)
--- a/app/assets/javascripts/manifest/model/association/has_many.js.coffee
+++ b/app/assets/javascripts/manifest/model/association/has_many.js.coffee
@@ -2,22 +2,20 @@ class Manifest.ModelModule.AssociationModule.HasMany extends ManifestBase.NameVa
   \r
   set_default: () ->\r
     super()\r
-    @values['foreign_key'] ||= @parent.model_name + '_id'\r
+    @values['item_name'] ||= Manifest.manifest().singularize(@name)\r
+    @values['foreign_key'] ||= @parent.item_name() + '_id'\r
     \r
   init: () ->\r
     super()\r
-    @model_name = @values['model_name']\r
+    @item_name = @values['item_name']\r
     @foreign_key = @values['foreign_key']\r
     @through = @values['through']\r
   \r
   is_through: () ->\r
     !@through\r
   \r
-  model_name: () ->\r
-    @model_name || Manifest.manifest().singularize(@name)\r
-  \r
   model: () ->\r
-    Manifest.item_name_to_model(@model_name())\r
+    Manifest.item_name_to_model(@item_name())\r
   \r
   association_name: () ->\r
     @parent.association_name\r