add bucket

[pettanr/pettanr.git] / app / assets / javascripts / locmare / form.js.coffee

diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee
index bb545af..7bff35d 100644 (file)
--- a/app/assets/javascripts/locmare/form.js.coffee
+++ b/app/assets/javascripts/locmare/form.js.coffee
@@ -14,8 +14,8 @@ class Locmare.FormBase extends Backbone.View
     @operators = options.operators\r
     if /\./.test(@form_name)\r
       @sub_form_names = @form_name.split('.')\r
-      @form_name = @sub_form_names.last\r
-      @root_form_name = @sub_form_names.shift\r
+      @form_name = @sub_form_names.pop()\r
+      @root_form_name = @sub_form_names.shift()\r
     else\r
       @sub_form_names = []\r
       #@form_name = @form_name\r
@@ -82,8 +82,8 @@ class Locmare.Form extends Locmare.FormBase
       else\r
         null\r
       if boost_name and extend_model # field is extend setting AND template has a extend model\r
-        extend_form_name = @item.boosters[boost_name].model_name\r
-        extend_item = @item.boosters[boost_name].extend_item\r
+        extend_form_name = _this.item.boosters[boost_name].model_name()\r
+        extend_item = _this.item.boosters[boost_name].extend_item()\r
         _this.fields[field_name] = new Locmare.ExtendForm({\r
           parent: _this, \r
           form_name: extend_form_name, \r
@@ -119,6 +119,8 @@ class Locmare.Form extends Locmare.FormBase
       alert('invalid')\r
   \r
 class Locmare.ExtendForm extends Locmare.FormBase\r
+  tagName: 'div'\r
+  className: 'fields'\r
   \r
   initialize: (options) ->\r
     @parent = options.parent\r
@@ -132,6 +134,14 @@ class Locmare.ExtendForm extends Locmare.FormBase
     @label = @field.label\r
     @init_fields()\r
   \r
+  render: () ->\r
+    this.$el.html('')\r
+    @div_fields = new Locmare.FormModule.Fields({\r
+      fields: @fields\r
+    })\r
+    this.$el.append(@div_fields.render().el)\r
+    this\r
+  \r
   init_fields: () ->\r
     _this = this\r
     _.each _this.manifest.field_names, (field_name) ->\r
@@ -142,9 +152,9 @@ class Locmare.ExtendForm extends Locmare.FormBase
         field_manifest: field_manifest\r
       })\r
   \r
-  form_field_name: (field_name) ->\r
+  form_field_name: (extend_field_name) ->\r
     # parent is field\r
-    @parent.form_field_name(field_name)  + '[' + field_name + ']'\r
+    @parent.form_field_name(@field_name)  + '[' + extend_field_name + ']'\r
   \r
 class Locmare.FormModule\r
 class Locmare.FormModule.Fields extends Backbone.View\r