work

diff --git a/app/assets/javascripts/manifest/work/listss.js.coffee.erb b/app/assets/javascripts/manifest/work/lists.js.coffee.erb
similarity index 89%
rename from app/assets/javascripts/manifest/work/listss.js.coffee.erb
rename to app/assets/javascripts/manifest/work/lists.js.coffee.erb
index 4f91e25..b5c9165 100644 (file)
--- a/app/assets/javascripts/manifest/work/listss.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/lists.js.coffee.erb
@@ -97,7 +97,7 @@
       by_sheet: {\r
         type: 'through_filter',\r
         from: 'sheet',\r
-        through: 'sheet_panels',\r
+        through: 'story_sheets',\r
         filter_key: 'sheet_id',\r
       },\r
       by_author: {\r
@@ -200,6 +200,9 @@
       public_list: {\r
         type: 'public',\r
       },\r
+      private_list: {\r
+        type: 'private',\r
+      },\r
       scroll_panels: {\r
         type: 'has_many',\r
         association_name: 'scroll_panels',\r
@@ -263,6 +266,9 @@
       public_list: {\r
         type: 'public',\r
       },\r
+      private_list: {\r
+        type: 'private',\r
+      },\r
       by_panel: {\r
         type: 'filter',\r
         from: 'panel',\r
@@ -281,6 +287,9 @@
       public_list: {\r
         type: 'public',\r
       },\r
+      private_list: {\r
+        type: 'private',\r
+      },\r
       by_panel: {\r
         type: 'filter',\r
         from: 'panel',\r
@@ -304,6 +313,12 @@
       public_list: {\r
         type: 'public',\r
       },\r
+      by_speech_balloon: {\r
+        type: 'filter',\r
+        from: 'speech_balloon',\r
+        includes: {speech_balloon: {panel: {}}},\r
+        filter_key: 'speech_balloon_id',\r
+      },\r
       by_writing_format: {\r
         type: 'filter',\r
         from: 'writing_format',\r
@@ -317,6 +332,12 @@
       public_list: {\r
         type: 'public',\r
       },\r
+      by_speech_balloon: {\r
+        type: 'filter',\r
+        from: 'speech_balloon',\r
+        includes: {speech_balloon: {panel: {}}},\r
+        filter_key: 'speech_balloon_id',\r
+      },\r
       #by_system_picture: {\r
       #  type: 'filter',\r
       #  from: 'system_picture',\r
@@ -330,6 +351,9 @@
       public_list: {\r
         type: 'public',\r
       },\r
+      private_list: {\r
+        type: 'private',\r
+      },\r
       by_panel: {\r
         type: 'filter',\r
         from: 'panel',\r
@@ -348,6 +372,9 @@
       public_list: {\r
         type: 'public',\r
       },\r
+      private_list: {\r
+        type: 'private',\r
+      },\r
       by_panel: {\r
         type: 'filter',\r
         from: 'panel',\r

diff --git a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
index a94e738..3fcf54c 100644 (file)
--- a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
@@ -84,7 +84,7 @@
       }, \r
       'sheets.by_story': {\r
         model_name: 'sheet',\r
-        list_name: 'by_sheet',\r
+        list_name: 'by_story',\r
       }, \r
     }, \r
     columns: [\r
@@ -288,7 +288,7 @@
         list_name: 'by_speech_balloon',\r
       }, \r
       'speech.by_speech_balloon': {\r
-        model_name: 'panel',\r
+        model_name: 'speech',\r
         list_name: 'by_speech_balloon',\r
       }, \r
     }, \r

diff --git a/config/routes.rb b/config/routes.rb
index 604cd7b..c168c74 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -215,6 +215,7 @@ Pettanr::Application.routes.draw do
       get :show
     end
     member do
+      get :by_speech_balloon
       #get :by_system_picture
     end
   end
@@ -224,6 +225,7 @@ Pettanr::Application.routes.draw do
       get :show
     end
     member do
+      get :by_speech_balloon
       get :by_writing_format
     end
   end

diff --git a/lib/manifest/list.rb b/lib/manifest/list.rb
index 8707b4c..b47fbda 100644 (file)
--- a/lib/manifest/list.rb
+++ b/lib/manifest/list.rb
@@ -94,7 +94,7 @@ module Pettanr
       end
       
       def includes
-     @with_model_name ? {@with_model_name.classify.constantize.table_name => {}} : {}
+  #   @with_model_name ? {@with_model_name.classify.constantize.table_name => {}} : {}
         w = @owner_model ? {@owner_model.item_name => {}} : {}
         w.merge({@association_model.table_name => {} }) 
       end
@@ -115,6 +115,7 @@ module Pettanr
         @list_list_conf = @manifest.list(@item_name).lists[list_name] || {}
         @from = @list_list_conf['from']
         @filter_key = @list_list_conf['filter_key']
+        @includes = @list_list_conf['includes']
         
         @with_model_name = @list_list_conf['with']
       end
@@ -126,6 +127,7 @@ module Pettanr
       end
       
       def includes
+        return @includes if @includes
         w = @owner_model ? {@owner_model.item_name => {}} : {}
         w.merge({@from => {} }) 
       end

diff --git a/lib/manifest/profiler.rb b/lib/manifest/profiler.rb
index 0b6140e..73c4be4 100644 (file)
--- a/lib/manifest/profiler.rb
+++ b/lib/manifest/profiler.rb
@@ -126,6 +126,7 @@ module Pettanr
           raise "undefined has_many list for #{model_name}::#{list_name}\nconf:#{@controller_conf}\n" unless @manifest.list_managers[model_name]
           list = @manifest.list_managers[model_name].open(list_name, 1, 3, @operators)
           items = list.items @item
+#p [model_name, list_name, @item, list.class, list.includes, list.where(@item )]
           has_many_filer = @manifest.filer_managers[model_name].open model_name, items, @operators, nil
           yield has_many_filer
         end
@@ -133,9 +134,13 @@ module Pettanr
       
       def each_has_one 
         @has_one_conf.each do |profiler_list_name|
-          list = @manifest.list_managers[@item_name].open(profiler_list_name, 1, 1, @operators)
-          items = list.items 
-          has_one_filer = @manifest.filer_managers[@item_name].open @item_name, items, @operators, nil
+          raise "undefined lists for #{profiler_list_name} in #{@lists}\n" unless @lists[profiler_list_name]
+          model_name = @lists[profiler_list_name]['model_name']
+          list_name = @lists[profiler_list_name]['list_name']
+          raise "undefined has_one list for #{model_name}::#{list_name}\nconf:#{@controller_conf}\n" unless @manifest.list_managers[model_name]
+          list = @manifest.list_managers[model_name].open(list_name, 1, 1, @operators)
+          items = list.items @item
+          has_one_filer = @manifest.filer_managers[model_name].open model_name, items, @operators, nil
           yield has_one_filer
         end
       end

diff --git a/public/manifest.json b/public/manifest.json
index 232f777..d8cc207 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -2870,7 +2870,7 @@
         "by_sheet": {\r
           "type": "through_filter",\r
           "from": "sheet",\r
-          "through": "sheet_panels",\r
+          "through": "story_sheets",\r
           "filter_key": "sheet_id"\r
         },\r
         "by_author": {\r
@@ -3077,6 +3077,16 @@
         "public_list": {\r
           "type": "public"\r
         },\r
+        "by_speech_balloon": {\r
+          "type": "filter",\r
+          "from": "speech_balloon",\r
+          "includes": {\r
+            "speech_balloon": {\r
+              "panel": {}\r
+            }\r
+          },\r
+          "filter_key": "speech_balloon_id"\r
+        },\r
         "by_writing_format": {\r
           "type": "filter",\r
           "from": "writing_format",\r
@@ -3089,6 +3099,16 @@
       "lists": {\r
         "public_list": {\r
           "type": "public"\r
+        },\r
+        "by_speech_balloon": {\r
+          "type": "filter",\r
+          "from": "speech_balloon",\r
+          "includes": {\r
+            "speech_balloon": {\r
+              "panel": {}\r
+            }\r
+          },\r
+          "filter_key": "speech_balloon_id"\r
         }\r
       }\r
     },\r
@@ -3586,7 +3606,7 @@
           },\r
           "sheets.by_story": {\r
             "model_name": "sheet",\r
-            "list_name": "by_sheet"\r
+            "list_name": "by_story"\r
           }\r
         },\r
         "columns": [\r
@@ -3784,7 +3804,7 @@
             "list_name": "by_speech_balloon"\r
           },\r
           "speech.by_speech_balloon": {\r
-            "model_name": "panel",\r
+            "model_name": "speech",\r
             "list_name": "by_speech_balloon"\r
           }\r
         },\r