fix has one manifest

diff --git a/app/assets/javascripts/manifest/work/models.js.coffee.erb b/app/assets/javascripts/manifest/work/models.js.coffee.erb
index e201771..f61a285 100644 (file)
--- a/app/assets/javascripts/manifest/work/models.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/models.js.coffee.erb
@@ -705,7 +705,7 @@
     },\r
   },\r
   speech_balloon: {\r
-    extend: 'classname', \r
+    extend_column_name: 'classname', \r
     associations: {\r
       belongs_to: {\r
         panel: {\r
@@ -1486,6 +1486,7 @@
     },\r
   },\r
   speech_balloon_template: {\r
+    extend_column_name: 'classname', \r
     associations: {\r
       belongs_to: {\r
         system_picture: {\r
@@ -1555,6 +1556,7 @@
     },\r
   },\r
   writing_format: {\r
+    extend_column_name: 'classname', \r
     associations: {\r
       belongs_to: {\r
         system_picture: {\r
@@ -1613,6 +1615,7 @@
     },\r
   },\r
   license_group: {\r
+    extend_column_name: 'classname', \r
     associations: {\r
       belongs_to: {\r
       },\r

diff --git a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
index 19482e2..b88eb85 100644 (file)
--- a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
@@ -18,7 +18,7 @@
     }, \r
   },\r
   scroll_panel: {\r
-    columns: [\r
+    column_names: [\r
       'scroll_id', \r
       'panel_id', \r
       't', \r
@@ -32,7 +32,7 @@
     }, \r
   },\r
   comic: {\r
-    columns: [\r
+    column_names: [\r
       'title', \r
       'description', \r
       'visible', \r
@@ -48,7 +48,7 @@
     }, \r
   },\r
   story: {\r
-    columns: [\r
+    column_names: [\r
       'comic_id', \r
       'title', \r
       'description', \r
@@ -66,7 +66,7 @@
     }, \r
   },\r
   story_sheet: {\r
-    columns: [\r
+    column_names: [\r
       'story_id', \r
       'sheet_id', \r
       't', \r
@@ -80,7 +80,7 @@
     }, \r
   },\r
   sheet: {\r
-    columns: [\r
+    column_names: [\r
       'caption', \r
       'width', \r
       'height', \r
@@ -100,7 +100,7 @@
     }, \r
   },\r
   sheet_panel: {\r
-    columns: [\r
+    column_names: [\r
       'sheet_id', \r
       'panel_id', \r
       'x', \r
@@ -117,7 +117,7 @@
     }, \r
   },\r
   panel: {\r
-    columns: [\r
+    column_names: [\r
       'width', \r
       'height', \r
       'border', \r
@@ -142,7 +142,7 @@
     }, \r
   },\r
   panel_picture: {\r
-    columns: [\r
+    column_names: [\r
       'panel_id', \r
       'picture_id', \r
       'caption', \r
@@ -161,7 +161,7 @@
     }, \r
   },\r
   speech_balloon: {\r
-    columns: [\r
+    column_names: [\r
       'panel_id', \r
       'speech_balloon_template_id', \r
       'classname', \r
@@ -181,7 +181,7 @@
     }, \r
   },\r
   speech: {\r
-    columns: [\r
+    column_names: [\r
       'speech_balloon_id', \r
       'writing_format_id', \r
       'content', \r
@@ -203,7 +203,7 @@
     }, \r
   },\r
   balloon: {\r
-    columns: [\r
+    column_names: [\r
       'speech_balloon_id', \r
       'system_picture_id', \r
       'x', \r
@@ -221,7 +221,7 @@
     }, \r
   },\r
   ground_picture: {\r
-    columns: [\r
+    column_names: [\r
       'panel_id', \r
       'picture_id', \r
       'caption', \r
@@ -238,7 +238,7 @@
     }, \r
   },\r
   ground_color: {\r
-    columns: [\r
+    column_names: [\r
       'panel_id', \r
       'caption', \r
       'code', \r
@@ -255,7 +255,7 @@
     }, \r
   },\r
   original_picture: {\r
-    columns: [\r
+    column_names: [\r
       'ext', \r
       'width', \r
       'height', \r
@@ -276,7 +276,7 @@
     }, \r
   },\r
   picture: {\r
-    columns: [\r
+    column_names: [\r
       'original_picture_id', \r
       'revision', \r
       'ext', \r
@@ -299,7 +299,7 @@
     }, \r
   },\r
   resource_picture: {\r
-    columns: [\r
+    column_names: [\r
       'original_picture_id', \r
       'revision', \r
       'ext', \r
@@ -324,7 +324,7 @@
     }, \r
   },\r
   speech_balloon_template: {\r
-    columns: [\r
+    column_names: [\r
       'name', \r
       'classname', \r
       'caption', \r
@@ -339,7 +339,7 @@
     }, \r
   },\r
   writing_format: {\r
-    columns: [\r
+    column_names: [\r
       'name', \r
       'classname', \r
       'caption', \r
@@ -356,7 +356,7 @@
     }, \r
   },\r
   license_group: {\r
-    columns: [\r
+    column_names: [\r
       'name', \r
       'classname', \r
       'caption', \r
@@ -369,7 +369,7 @@
     }, \r
   },\r
   license: {\r
-    columns: [\r
+    column_names: [\r
       'license_group_id', \r
       'name', \r
       'caption', \r
@@ -389,7 +389,7 @@
     }, \r
   },\r
   author: {\r
-    columns: [\r
+    column_names: [\r
       'name', \r
       'user_id', \r
     ],\r
@@ -408,7 +408,7 @@
     }, \r
   },\r
   artist: {\r
-    columns: [\r
+    column_names: [\r
       'name', \r
       'author_id', \r
     ],\r
@@ -419,7 +419,7 @@
     }, \r
   },\r
   system_picture: {\r
-    columns: [\r
+    column_names: [\r
       'ext', \r
       'width', \r
       'height', \r

diff --git a/lib/manifest/model.rb b/lib/manifest/model.rb
index 876b0a4..a6311c9 100644 (file)
--- a/lib/manifest/model.rb
+++ b/lib/manifest/model.rb
@@ -15,7 +15,7 @@ module Manifest
     end
     
     attr :model_name, :model_manifest, 
-      :attributes, :associations, :tree, :lists
+      :attributes, :associations, :tree, :lists, :extend_column_name
     def initialize manifest, model_name, model_manifest
       @manifest = manifest
       @model_name = model_name
@@ -29,6 +29,7 @@ module Manifest
       @model_manifest['associations'] ||= {}
       @model_manifest['tree'] ||= {}
       @model_manifest['lists'] ||= {}
+      @model_manifest['extend_column_name'] ||= 'classname'
       @model_manifest['attributes']['id'] = {
         'type' => 'number',
         'primary_key' => 1,
@@ -54,6 +55,7 @@ module Manifest
       @model_manifest['tree'].each {|tree_name, parent_model_name|
         @tree[tree_name] = ModelModule::Tree.new(self, tree_name, parent_model_name)
       }
+      @extend_column_name = @model_manifest['extend_column_name']
       @lists = {}
       @model_manifest['lists'].each {|list_name, list_manifest|
         @lists[list_name] = ModelModule::ListFactory.factory(self, list_name, list_manifest)

diff --git a/lib/peta/item.rb b/lib/peta/item.rb
index b3db406..df4564b 100644 (file)
--- a/lib/peta/item.rb
+++ b/lib/peta/item.rb
@@ -96,8 +96,12 @@ module Peta
       end
     end
     
+    def engine
+      Object.const_get self.extend_column
+    end
+    
     def extend_engine_module
-      self.extend self.speech_balloon_template.engine_speech_balloon_module
+      self.extend self.engine.extend_module
       self.elements.each do |element|
         element.extend_item
       end
@@ -115,16 +119,12 @@ module Peta
       self.class.table_name
     end
     
-    def extend_column
+    def extend_column_name
       nil
     end
     
-    def extend_item_name
-      self.extend_column ? self.attributes[self.extend_column] : self.item_name
-    end
-    
     def form_name
-      self.extend_item_name
+      self.extend_column ? self.attributes[self.extend_column] : self.item_name
     end
     
     def valid_encode
@@ -149,6 +149,9 @@ module Peta
       true
     end
     
+    def boost
+    end
+    
     def dom_id_item 
       self.new_record? ? '0' : self.id.to_s
     end

diff --git a/public/manifest.json b/public/manifest.json
index aab85a4..2fe139d 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -2905,7 +2905,7 @@
         }\r
       },\r
       "scroll_panel": {\r
-        "columns": [\r
+        "column_names": [\r
           "scroll_id",\r
           "panel_id",\r
           "t",\r
@@ -2919,7 +2919,7 @@
         }\r
       },\r
       "comic": {\r
-        "columns": [\r
+        "column_names": [\r
           "title",\r
           "description",\r
           "visible",\r
@@ -2935,7 +2935,7 @@
         }\r
       },\r
       "story": {\r
-        "columns": [\r
+        "column_names": [\r
           "comic_id",\r
           "title",\r
           "description",\r
@@ -2953,7 +2953,7 @@
         }\r
       },\r
       "story_sheet": {\r
-        "columns": [\r
+        "column_names": [\r
           "story_id",\r
           "sheet_id",\r
           "t",\r
@@ -2967,7 +2967,7 @@
         }\r
       },\r
       "sheet": {\r
-        "columns": [\r
+        "column_names": [\r
           "caption",\r
           "width",\r
           "height",\r
@@ -2987,7 +2987,7 @@
         }\r
       },\r
       "sheet_panel": {\r
-        "columns": [\r
+        "column_names": [\r
           "sheet_id",\r
           "panel_id",\r
           "x",\r
@@ -3004,7 +3004,7 @@
         }\r
       },\r
       "panel": {\r
-        "columns": [\r
+        "column_names": [\r
           "width",\r
           "height",\r
           "border",\r
@@ -3029,7 +3029,7 @@
         }\r
       },\r
       "panel_picture": {\r
-        "columns": [\r
+        "column_names": [\r
           "panel_id",\r
           "picture_id",\r
           "caption",\r
@@ -3048,7 +3048,7 @@
         }\r
       },\r
       "speech_balloon": {\r
-        "columns": [\r
+        "column_names": [\r
           "panel_id",\r
           "speech_balloon_template_id",\r
           "classname",\r
@@ -3068,7 +3068,7 @@
         }\r
       },\r
       "speech": {\r
-        "columns": [\r
+        "column_names": [\r
           "speech_balloon_id",\r
           "writing_format_id",\r
           "content",\r
@@ -3090,7 +3090,7 @@
         }\r
       },\r
       "balloon": {\r
-        "columns": [\r
+        "column_names": [\r
           "speech_balloon_id",\r
           "system_picture_id",\r
           "x",\r
@@ -3108,7 +3108,7 @@
         }\r
       },\r
       "ground_picture": {\r
-        "columns": [\r
+        "column_names": [\r
           "panel_id",\r
           "picture_id",\r
           "caption",\r
@@ -3125,7 +3125,7 @@
         }\r
       },\r
       "ground_color": {\r
-        "columns": [\r
+        "column_names": [\r
           "panel_id",\r
           "caption",\r
           "code",\r
@@ -3142,7 +3142,7 @@
         }\r
       },\r
       "original_picture": {\r
-        "columns": [\r
+        "column_names": [\r
           "ext",\r
           "width",\r
           "height",\r
@@ -3163,7 +3163,7 @@
         }\r
       },\r
       "picture": {\r
-        "columns": [\r
+        "column_names": [\r
           "original_picture_id",\r
           "revision",\r
           "ext",\r
@@ -3186,7 +3186,7 @@
         }\r
       },\r
       "resource_picture": {\r
-        "columns": [\r
+        "column_names": [\r
           "original_picture_id",\r
           "revision",\r
           "ext",\r
@@ -3211,7 +3211,7 @@
         }\r
       },\r
       "speech_balloon_template": {\r
-        "columns": [\r
+        "column_names": [\r
           "name",\r
           "classname",\r
           "caption",\r
@@ -3226,7 +3226,7 @@
         }\r
       },\r
       "writing_format": {\r
-        "columns": [\r
+        "column_names": [\r
           "name",\r
           "classname",\r
           "caption",\r
@@ -3243,7 +3243,7 @@
         }\r
       },\r
       "license_group": {\r
-        "columns": [\r
+        "column_names": [\r
           "name",\r
           "classname",\r
           "caption",\r
@@ -3256,7 +3256,7 @@
         }\r
       },\r
       "license": {\r
-        "columns": [\r
+        "column_names": [\r
           "license_group_id",\r
           "name",\r
           "caption",\r
@@ -3276,7 +3276,7 @@
         }\r
       },\r
       "author": {\r
-        "columns": [\r
+        "column_names": [\r
           "name",\r
           "user_id"\r
         ],\r
@@ -3295,7 +3295,7 @@
         }\r
       },\r
       "artist": {\r
-        "columns": [\r
+        "column_names": [\r
           "name",\r
           "author_id"\r
         ],\r
@@ -3306,7 +3306,7 @@
         }\r
       },\r
       "system_picture": {\r
-        "columns": [\r
+        "column_names": [\r
           "ext",\r
           "width",\r
           "height",\r