fix: fetch fail

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

diff --git a/app/assets/javascripts/locmare/bucket.js.coffee b/app/assets/javascripts/locmare/bucket.js.coffee
index 442c71c..caeae72 100644 (file)
--- a/app/assets/javascripts/locmare/bucket.js.coffee
+++ b/app/assets/javascripts/locmare/bucket.js.coffee
@@ -1,33 +1,30 @@
-class Locmare.Bucket extends Backbone.View\r
+class Locmare.Bucket extends Pettanr.View\r
   tagName: 'form'\r
   \r
-  @factory: (bucket_or_form_name, item, mounted, submit, operators) ->\r
+  @factory: (bucket_or_form_name, use_name, item, submit) ->\r
     bucket = LocalManifest.manifest().buckets[bucket_or_form_name]\r
     if bucket and bucket.has_member()\r
       new Locmare.Bucket({\r
         bucket_name: bucket_or_form_name, \r
+        use_name: use_name,\r
         item: item, \r
-        mounted: mounted, \r
         submit: submit, \r
-        operators: operators,\r
         action: '/' + item.table_name() + '/' + Pettanr.to_s(item.get('id'))\r
       })\r
     else\r
-      new Locmare.Form({\r
+      Locmare.Form.factory({\r
         form_name: bucket_or_form_name, \r
+        use_name: use_name,\r
         item: item, \r
-        mounted: mounted, \r
         submit: submit, \r
-        operators: operators,\r
         action: '/' + item.table_name() + '/' + Pettanr.to_s(item.get('id'))\r
       })\r
   \r
   initialize: (options) ->\r
     @bucket_name = options.bucket_name\r
+    @use_name = options.use_name\r
     @item = options.item\r
-    @mounted = options.mounted\r
     @submit = options.submit\r
-    @operators = options.operators\r
     \r
     @item.boosts 'post'\r
     @manifest = LocalManifest.manifest().buckets[@bucket_name]\r
@@ -35,10 +32,9 @@ class Locmare.Bucket extends Backbone.View
     @forms = {}\r
     @forms[@item.item_name()] = new Locmare.Form({\r
       form_name: @item.item_name(), \r
+      use_name: @use_name,\r
       item: @item, \r
-      mounted: @mounted, \r
       submit: false, \r
-      operators: @operators\r
     })\r
     @init_forms(@item.item_name(), @manifest, @item)\r
     @init_fields()\r
@@ -56,40 +52,35 @@ class Locmare.Bucket extends Backbone.View
     @members_fold_extend_settings @item, params[@item.item_name()], @manifest\r
   \r
   members_fold_extend_settings: (fold_item, attr, man) ->\r
-    _this = this\r
-    _.each man.members, (member_manifest, member_name) ->\r
+    _.each man.members, (member_manifest, member_name) =>\r
       member_item = fold_item[member_name]()\r
       member_item.my_class().fold_extend_settings attr[member_name + '_attributes']\r
-      _this.members_fold_extend_settings member_item, attr[member_name + '_attributes'], member_manifest\r
+      @members_fold_extend_settings member_item, attr[member_name + '_attributes'], member_manifest\r
   \r
   push_form: (key, form_name, item) ->\r
   \r
   init_forms: (key, man, item) ->\r
-    _this = this\r
-    _.each man.members, (member_manifest, member_name) ->\r
+    _.each man.members, (member_manifest, member_name) =>\r
       form_name = member_name   # write exchange function if you want\r
       member_item = item.get(form_name)\r
       new_key = key + '.' + form_name\r
-      _this.forms[new_key] = new Locmare.Form({\r
+      @forms[new_key] = new Locmare.Form({\r
         form_name: new_key, \r
         item: member_item, \r
-        mounted: _this.mounted, \r
         submit: false, \r
-        operators: _this.operators\r
       })\r
-      _this.init_forms(new_key, member_manifest, member_item)\r
+      @init_forms(new_key, member_manifest, member_item)\r
   \r
   init_fields: () ->\r
-    _this = this\r
-    _.each @manifest.form_field_names, (form_field_name) ->\r
+    _.each @manifest.form_field_names, (form_field_name) =>\r
       r = if Pettanr.is_blank(form_field_name.form_name)\r
         ''\r
       else\r
         '.' + form_field_name.form_name\r
-      key = _this.item.item_name() + r\r
-      form = _this.forms[key]\r
+      key = @item.item_name() + r\r
+      form = @forms[key]\r
       field = form.fields[form_field_name.field_name]\r
-      _this.form_fields.push(field)\r
+      @form_fields.push(field)\r
   \r
   image_dir: () ->\r
     '/images/'\r