fix bucket

diff --git a/app/assets/javascripts/manifest/work/buckets.js.coffee.erb b/app/assets/javascripts/manifest/work/buckets.js.coffee.erb
index 17758c0..e21ca9d 100644 (file)
--- a/app/assets/javascripts/manifest/work/buckets.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/buckets.js.coffee.erb
@@ -25,7 +25,7 @@
       speech: {\r
       },\r
     },\r
-    field_names: [\r
+    form_field_names: [\r
       'caption',\r
       'id',\r
       'panel_id',\r

diff --git a/app/assets/javascripts/manifest/work/forms.js.coffee.erb b/app/assets/javascripts/manifest/work/forms.js.coffee.erb
index 161bb70..89561e5 100644 (file)
--- a/app/assets/javascripts/manifest/work/forms.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/forms.js.coffee.erb
@@ -668,12 +668,7 @@
         },\r
       },\r
       speech_balloon_template_settings: {\r
-        label: {\r
-          type: 'none',\r
-        },\r
-        tag: {\r
-          type: 'hidden',\r
-        },\r
+        row_break: true,\r
       },\r
     },\r
     field_names: [\r
@@ -767,12 +762,7 @@
         },\r
       },\r
       speech_balloon_template_settings: {\r
-        label: {\r
-          type: 'none',\r
-        },\r
-        tag: {\r
-          type: 'hidden',\r
-        },\r
+        row_break: true,\r
       },\r
     },\r
     field_names: [\r
@@ -916,12 +906,7 @@
         },\r
       },\r
       speech_balloon_template_settings: {\r
-        label: {\r
-          type: 'none',\r
-        },\r
-        tag: {\r
-          type: 'hidden',\r
-        },\r
+        row_break: true,\r
       },\r
       writing_format_settings: {\r
         label: {\r

diff --git a/app/assets/javascripts/manifest/work/items.js.coffee.erb b/app/assets/javascripts/manifest/work/items.js.coffee.erb
index 27b5811..f3cb3c0 100644 (file)
--- a/app/assets/javascripts/manifest/work/items.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/items.js.coffee.erb
@@ -67,6 +67,7 @@
       parent_model_name: 'speech_balloon',\r
       boost: {\r
         speech_balloon_template: {\r
+          resource_name: 'speech_balloon_template',\r
           extend_item_name: 'balloon',\r
         },\r
       },\r
@@ -80,6 +81,7 @@
         writing_format: {\r
         },\r
         speech_balloon_template: {\r
+          resource_name: 'speech_balloon_template',\r
           extend_item_name: 'speech',\r
         },\r
       },\r

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index dd376c4..24def61 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -178,7 +178,7 @@ class ApplicationController < ActionController::Base
   def render_form
     respond_to do |format|
       format.html { 
-        @form = Locmare::Form.new @item.item_name, @item, true, true, @operators
+        @form = Locmare::Bucket.factory @item.item_name, @item, true, true, @operators
         render @form.template_name, :locals => {
           :form => @form
         }

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index b486f14..6744bd5 100644 (file)
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -92,12 +92,13 @@ class SpeechBalloonsController < ApplicationController
   end
 
   def update
-    SpeechBalloon.fold_extend_settings params
-    @speech_balloon = SpeechBalloon.show(params[:id], @operators)
+    @item = SpeechBalloon.show(params[:id], @operators)
+    @speech_balloon = @item
+    @form = Locmare::Bucket.factory @item.item_name, @item, true, true, @operators
+    @form.fold_extend_settings params
     @speech_balloon.attributes = params[:speech_balloon]
     
     @speech_balloon_template = @speech_balloon.speech_balloon_template
-    @speech_balloon.boosts 'post'
     
     params[:speech_balloon][:balloon_attributes][:system_picture_id] = @speech_balloon.balloon.select_system_picture 
     
@@ -105,7 +106,7 @@ class SpeechBalloonsController < ApplicationController
     @speech_balloon.overwrite @panel.id
     
     respond_to do |format|
-      if @speech_balloon.valid? and @speech_balloon.store(@operators, params[:speech_balloon])
+      if @speech_balloon.save
         flash[:notice] = I18n.t('flash.notice.updated', :model => SpeechBalloon.model_name.human)
         format.html { redirect_to @speech_balloon }
         format.json { head :ok }

diff --git a/app/models/panel.rb b/app/models/panel.rb
index d19cc62..803906f 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -211,9 +211,7 @@ class Panel < Peta::Root
     self.overwrite operators
     res = false
     Panel.transaction do
-      self.panel_elements.each do |elm|
-        elm.boost
-      end
+      self.boosts 'post'
 #self.publish = nil
       res = self.save
       unless validate_child

diff --git a/config/environments/development.rb b/config/environments/development.rb
index dc6d945..236162f 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,11 +1,13 @@
 Pettanr::Application.configure do
-
+autoload = true
+if autoload
   ActiveSupport::Dependencies.autoload_paths << File::join( Rails.root, 'lib')
   ActiveSupport::Dependencies.explicitly_unloadable_constants << 'Peta' 
   ActiveSupport::Dependencies.explicitly_unloadable_constants << 'Editor' 
   ActiveSupport::Dependencies.explicitly_unloadable_constants << 'ManifestBase' 
   ActiveSupport::Dependencies.explicitly_unloadable_constants << 'Manifest' 
   ActiveSupport::Dependencies.explicitly_unloadable_constants << 'LocalManifest' 
+end
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on

diff --git a/db/migrate/20140422233206_add_system_picture_id_on_resource_picture_data.rb b/db/migrate/20140422233206_add_system_picture_id_on_resource_picture_data.rb
index 3a7b73f..6657b5c 100644 (file)
--- a/db/migrate/20140422233206_add_system_picture_id_on_resource_picture_data.rb
+++ b/db/migrate/20140422233206_add_system_picture_id_on_resource_picture_data.rb
@@ -31,7 +31,7 @@ class AddSystemPictureIdOnResourcePictureData < ActiveRecord::Migration
           i.license_settings = s.to_json
         end
         i.boosts 'post'
-        i.save!
+        i.save! if i.original_picture
       end
     end
   end

diff --git a/db/migrate/20140425021754_create_folders.rb b/db/migrate/20140425021754_create_folders.rb
index 772280a..1f8fd84 100644 (file)
--- a/db/migrate/20140425021754_create_folders.rb
+++ b/db/migrate/20140425021754_create_folders.rb
@@ -1,6 +1,5 @@
 class CreateFolders < ActiveRecord::Migration
   def change
-    drop_table :folders
     create_table :folders do |t|
       t.string :name, :null => false
       t.string :controller_name

diff --git a/lib/local_manifest/bucket.rb b/lib/local_manifest/bucket.rb
index 94924c6..09d2917 100644 (file)
--- a/lib/local_manifest/bucket.rb
+++ b/lib/local_manifest/bucket.rb
@@ -1,33 +1,32 @@
 ManifestBase.require_modules "local_manifest/bucket/", 
-  %w|member field_name|
+  %w|member form_field_name|
 
 module LocalManifest
   class Bucket < ManifestBase::Base
     include BucketModule
     
-    attr :members, :field_names
+    attr :members, :form_field_names
     
     def set_default
       super
       @json['members'] ||= {}
-      @json['field_names'] ||= {}
+      @json['form_field_names'] ||= {}
     end
     
     def init
       super
       @members = ManifestBase.load_name_values self, @json, 'members', Member
-      @field_names = ManifestBase.load_value self, @json, 'field_names', FieldName
+      @form_field_names = ManifestBase.load_names self, @json, 'form_field_names', FormFieldName
     end
     
-    def item_name
-      @name
+    def has_member?
+      @members.any?
     end
     
-    def each_column
-      @column_names
+    def item_name
+      @name
     end
     
   end
-  
 end
 

diff --git a/lib/local_manifest/bucket/field_name.rb b/lib/local_manifest/bucket/form_field_name.rb
similarity index 58%
rename from lib/local_manifest/bucket/field_name.rb
rename to lib/local_manifest/bucket/form_field_name.rb
index 2863350..046c575 100644 (file)
--- a/lib/local_manifest/bucket/field_name.rb
+++ b/lib/local_manifest/bucket/form_field_name.rb
@@ -1,7 +1,7 @@
 module LocalManifest
   module BucketModule
-    class FieldName < ManifestBase::Values
-      attr :form_name, :field_name
+    class FormFieldName < ManifestBase::Names
+      attr :form_names, :field_name, :form_name
       
       def set_default
         super
@@ -9,9 +9,9 @@ module LocalManifest
       
       def init
         super
-        t = @values.split '.'
-        @form_name = t.size < 2 ? self.bucket_name : t.first
-        @field_name = t.last
+        @form_names = @name.split '.'
+        @field_name = @form_names.pop
+        @form_name = @form_names.join '.'
       end
       
       def bucket_name
@@ -23,6 +23,5 @@ module LocalManifest
       end
       
     end
-    
   end
 end

diff --git a/lib/locmare/bucket.rb b/lib/locmare/bucket.rb
index 2a80ef8..80e87d7 100644 (file)
--- a/lib/locmare/bucket.rb
+++ b/lib/locmare/bucket.rb
@@ -1,11 +1,22 @@
 require_dependency "locmare/bucket/member"
-require_dependency "locmare/bucket/field_name"
+require_dependency "locmare/bucket/form_field_name"
 
 module Locmare
   class Bucket
     include BucketModule
     attr :manifest, :bucket_name, :item, :mounted, :submit, :operators, :template_dir, 
       :fields
+    
+    def self.factory bucket_or_form_name, item, mounted, submit, operators
+      bucket = LocalManifest.manifest.buckets[bucket_or_form_name]
+      c = if bucket and bucket.has_member?
+        Locmare::Bucket
+      else
+        Locmare::Form
+      end
+      c.new bucket_or_form_name, item, mounted, submit, operators
+    end
+    
     def initialize bucket_name, item, mounted, submit, operators
       @bucket_name = bucket_name
       @item = item
@@ -14,27 +25,58 @@ module Locmare
       @operators = operators
       
       @item.boosts 'post'
-      self.init_fields
-      @manifest = LocalManifest.manifest.forms[@form_name]
+      @manifest = LocalManifest.manifest.buckets[@bucket_name]
       @template_dir = 'templates/r/form/'
-      @fields = {}
+      @form_fields = []
+      @forms = {}
+      self.push_form @item.item_name, @item.item_name, @item
+      self.init_forms @item.item_name, @manifest, @item
+      self.init_fields
     end
     
-    def init_fields
-      @manifest.each_field do |field_name, field_manifest| 
-        if boost_name = @item.class.find_boost_name(field_name)
-          extend_form_name = @item.boosters[boost_name].model_name
-          extend_item = @item.boosters[boost_name].extend_item
-          @fields[field_name] = ExtendForm.new self, extend_form_name, extend_item, @mounted, @operators, field_name
-        else
-          @fields[field_name] = Field.new self, field_name, field_manifest
-        end
+    def fold_extend_settings params
+    p params
+    p params[@item.item_name]['speech']
+      @item.class.fold_extend_settings params[@item.item_name]
+      self.members_fold_extend_settings @item, params[@item.item_name], @manifest
+    end
+    
+    def members_fold_extend_settings fold_item, attr, man
+    p attr
+      man.members.each do |member_name, member_manifest|
+        member_item = fold_item.__send__ member_name
+        member_item.class.fold_extend_settings attr[member_name + '_attributes']
+        self.members_fold_extend_settings member_item, attr[member_name + '_attributes'], member_manifest
       end
     end
     
     def each_field
-      @manifest.field_names.each do |field_name| 
-        yield field_name, @fields[field_name]
+      @form_fields.each do |field_manifest|
+        yield field_manifest.field_name, field_manifest
+      end
+    end
+    
+    def push_form key, form_name, item
+      @forms[key] = Locmare::Form.new form_name, item, @mounted, @submit, @operators
+    end
+    
+    def init_forms key, man, item
+      man.members.each do |member_name, member_manifest|
+        form_name = member_name   # write exchange function if you want
+        member_item = item.__send__(form_name)
+        new_key = key + '.' + form_name
+        self.push_form new_key, form_name, member_item
+        self.init_forms new_key, member_manifest, member_item
+      end
+    end
+    
+    def init_fields
+      @manifest.form_field_names.each do |form_field_name|
+        r = form_field_name.form_name.blank? ? '' : '.' + form_field_name.form_name
+        key = @item.item_name + r
+        form = @forms[key]
+        field = form.fields[form_field_name.field_name]
+        @form_fields << field
       end
     end
     
@@ -74,6 +116,10 @@ module Locmare
       end
     end
     
+    def form_name
+      @bucket_name
+    end
+    
   end
   
 end

diff --git a/lib/locmare/bucket/field_name.rb b/lib/locmare/bucket/form_field_name.rb
similarity index 100%
rename from lib/locmare/bucket/field_name.rb
rename to lib/locmare/bucket/form_field_name.rb

diff --git a/lib/locmare/form.rb b/lib/locmare/form.rb
index 4f3bc9b..179c500 100644 (file)
--- a/lib/locmare/form.rb
+++ b/lib/locmare/form.rb
@@ -17,6 +17,10 @@ module Locmare
       @fields = {}
     end
     
+    def fold_extend_settings params
+      @item.class.fold_extend_settings params[@item.item_name]
+    end
+    
     def each_field
       @manifest.field_names.each do |field_name| 
         yield field_name, @fields[field_name]

diff --git a/lib/locmare/form/field.rb b/lib/locmare/form/field.rb
index 605e01c..e75f222 100644 (file)
--- a/lib/locmare/form/field.rb
+++ b/lib/locmare/form/field.rb
@@ -5,11 +5,12 @@ module Locmare
   module FormModule
     class Field
       include FieldModule
-      attr :form, :field_name, :field_manifest, 
-        :label, :tag, :helpers, :options
-      def initialize form, field_name, field_manifest
+      attr :form, :field_name_with_sub_form, :field_manifest, 
+        :label, :tag, :helpers, :options, 
+        :field_name, :sub_form_names
+      def initialize form, field_name_with_sub_form, field_manifest
         @form = form
-        @field_name = field_name
+        @field_name_with_sub_form = field_name_with_sub_form
         @field_manifest = field_manifest
         @label = LabelFactory.factory self, @field_manifest.label
         @tag = TagFactory.factory self, @field_manifest.tag
@@ -18,6 +19,8 @@ module Locmare
           @helpers[helper_name] = HelperFactory.factory self, helper_manifest
         }
         @options = {'data-model' => @field_manifest.form_name}
+        @sub_form_names = @field_name_with_sub_form.split '.'
+        @field_name = @sub_form_names.pop
       end
       
       def mounted
@@ -29,7 +32,11 @@ module Locmare
       end
       
       def item
-        @form.item
+        i = @form.item
+        @sub_form_names.each do |n|
+          i = i.__send__(n)  # has_many associate model does not work
+        end
+        i
       end
       
       def value
@@ -40,8 +47,12 @@ module Locmare
         self.item.field_tag_attributes(@field_manifest.column_name, tag_options).merge(self.mount_option)
       end
       
+      def sub_form_name
+        @sub_form_names.map{|name| '[' + name + '_attributes' + ']'}.join
+      end
+      
       def form_field_name
-        self.form_name + '[' + @field_name + ']'
+        @form.form_name + self.sub_form_name + '[' + @field_name + ']'
       end
       
       def form_name

diff --git a/lib/locmare/locmare.rb b/lib/locmare/locmare.rb
index 6c66269..50b8c25 100644 (file)
--- a/lib/locmare/locmare.rb
+++ b/lib/locmare/locmare.rb
@@ -2,4 +2,5 @@ require_dependency "locmare/filer"
 require_dependency "locmare/form"
 require_dependency "locmare/profiler"
 require_dependency "locmare/list_group"
+require_dependency "locmare/booster"
 require_dependency "locmare/bucket"

diff --git a/lib/manifest/model.rb b/lib/manifest/model.rb
index e513f8e..90059f7 100644 (file)
--- a/lib/manifest/model.rb
+++ b/lib/manifest/model.rb
@@ -70,8 +70,8 @@ module Manifest
       r = []
       ::Manifest.manifest.items.each {|peta_name, peta_manifest|
         next unless peta_manifest.element?
-        next unless peta_manifest.parent_model_name == @model_name
-        r << peta_manifest.model
+        next unless peta_manifest.parent_model_name == @name
+        r << ::Manifest.manifest.models[peta_name]
       }
       r
     end

diff --git a/lib/manifest_base/base.rb b/lib/manifest_base/base.rb
index 626f87f..d49b077 100644 (file)
--- a/lib/manifest_base/base.rb
+++ b/lib/manifest_base/base.rb
@@ -70,7 +70,6 @@ module ManifestBase
       }]
     end
     
-    # LocalManifest::Profiler::Association::HasMany
     def load_names _self, json, module_name, klass
       json[module_name].map {|_name|
         klass.new(_self, _name, module_name)

diff --git a/lib/peta/content.rb b/lib/peta/content.rb
index 6913295..8887813 100644 (file)
--- a/lib/peta/content.rb
+++ b/lib/peta/content.rb
@@ -23,21 +23,21 @@ module Peta
     def self.load_manifest
       super
       # Class Methods
-      f = self._content?
+      ct = self._content?
       define_singleton_method("content?") do 
-        f
+        ct
       end
-      t = self._owner_type
+      ot = self._owner_type
       define_singleton_method("owner_type") do 
-        t
+        ot
       end
-      m = self._owner_model
+      om = self._owner_model
       define_singleton_method("owner_model") do 
-        m
+        om
       end
-      o = self._owner_column
+      oc = self._owner_column
       define_singleton_method("owner_column") do 
-        o
+        oc
       end
       # Instance Methods
       define_method("elements") do |tree_name|

diff --git a/lib/peta/item.rb b/lib/peta/item.rb
index 0a3ba0b..74ae027 100644 (file)
--- a/lib/peta/item.rb
+++ b/lib/peta/item.rb
@@ -11,17 +11,17 @@ module Peta
     
     def self.load_manifest
       return nil unless self.my_manifest
-      r = self._valid_encode_columns
+      vc = self._valid_encode_columns
       define_singleton_method("valid_encode_columns") do 
-        r
+        vc
       end
-      r = self.my_manifest.child_models
+      cm = self.my_manifest.child_models
       define_singleton_method("child_models") do
-        r
+        cm
       end
-      r = self.my_manifest.child_element_names
+      cen = self.my_manifest.child_element_names
       define_singleton_method("child_element_names") do
-        r
+        cen
       end
       # Instance Methods
     end
@@ -121,16 +121,13 @@ module Peta
       {}
     end
     
-    def self.fold_extend_settings params
+    def self.fold_extend_settings attr
       self.my_peta.boost.each do |name, manifest|
-        my_settings = params[self.item_name][manifest.settings_column_name]
+        my_settings = attr[manifest.settings_column_name]
         if my_settings.is_a?(Hash)
-          params[self.item_name][manifest.settings_column_name] = my_settings.to_json
+          attr[manifest.settings_column_name] = my_settings.to_json
         end
       end
-      self.child_models.each do |child_model|
-        child_model.fold_extend_settings params
-      end
     end
     
     #InstanceMethods

diff --git a/public/local_manifest.json b/public/local_manifest.json
index 9ade01f..9fb456f 100644 (file)
--- a/public/local_manifest.json
+++ b/public/local_manifest.json
@@ -2405,12 +2405,7 @@
           }\r
         },\r
         "speech_balloon_template_settings": {\r
-          "label": {\r
-            "type": "none"\r
-          },\r
-          "tag": {\r
-            "type": "hidden"\r
-          }\r
+          "row_break": true\r
         }\r
       },\r
       "field_names": [\r
@@ -2502,12 +2497,7 @@
           }\r
         },\r
         "speech_balloon_template_settings": {\r
-          "label": {\r
-            "type": "none"\r
-          },\r
-          "tag": {\r
-            "type": "hidden"\r
-          }\r
+          "row_break": true\r
         }\r
       },\r
       "field_names": [\r
@@ -2651,12 +2641,7 @@
           }\r
         },\r
         "speech_balloon_template_settings": {\r
-          "label": {\r
-            "type": "none"\r
-          },\r
-          "tag": {\r
-            "type": "hidden"\r
-          }\r
+          "row_break": true\r
         },\r
         "writing_format_settings": {\r
           "label": {\r
@@ -3797,7 +3782,7 @@
         "balloon": {},\r
         "speech": {}\r
       },\r
-      "field_names": [\r
+      "form_field_names": [\r
         "caption",\r
         "id",\r
         "panel_id",\r