fix manifest

diff --git a/app/assets/javascripts/manifest/work/filers.js.coffee.erb b/app/assets/javascripts/manifest/work/filers.js.coffee.erb
index afdd387..b45fad6 100644 (file)
--- a/app/assets/javascripts/manifest/work/filers.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/filers.js.coffee.erb
@@ -3,17 +3,6 @@
   scroll: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
@@ -48,30 +37,13 @@
     symbol: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
         link: {\r
           type: 'none',\r
-          args: {\r
-          },\r
         },\r
       },\r
     },\r
     caption: {\r
-      type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-        link: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-      },\r
+      type: 'none',\r
     },\r
     summary: {\r
       type: 'template',\r
@@ -86,17 +58,6 @@
   comic: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
@@ -107,12 +68,6 @@
             name: 'title',\r
           },\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     summary: {\r
@@ -128,17 +83,6 @@
   story: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
@@ -146,7 +90,7 @@
         face: {\r
           type: 'method',\r
           args: {\r
-            name: 'title_with_t',\r
+            method_name: 'title_with_t',\r
           },\r
         },\r
         link: {\r
@@ -171,30 +115,13 @@
     symbol: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
         link: {\r
           type: 'none',\r
-          args: {\r
-          },\r
         },\r
       },\r
     },\r
     caption: {\r
-      type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-        link: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-      },\r
+      type: 'none',\r
     },\r
     summary: {\r
       type: 'template',\r
@@ -209,26 +136,12 @@
   sheet: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
       args: {\r
         face: {\r
           type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
         },\r
         link: {\r
           type: 'action'\r
@@ -252,30 +165,13 @@
     symbol: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
         link: {\r
           type: 'none',\r
-          args: {\r
-          },\r
         },\r
       },\r
     },\r
     caption: {\r
-      type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-        link: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-      },\r
+      type: 'none',\r
     },\r
     summary: {\r
       type: 'template',\r
@@ -290,31 +186,12 @@
   panel: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
-        },\r
         link: {\r
           type: 'none',\r
-          args: {\r
-          },\r
         },\r
       },\r
     },\r
@@ -335,27 +212,13 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
-        },\r
         link: {\r
           type: 'none',\r
-          args: {\r
-          },\r
         },\r
       },\r
     },\r
@@ -376,12 +239,6 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
@@ -390,13 +247,11 @@
         face: {\r
           type: 'method',\r
           args: {\r
-            name: 'plain_scenario',\r
+            method_name: 'plain_scenario',\r
           },\r
         },\r
         link: {\r
           type: 'none',\r
-          args: {\r
-          },\r
         },\r
       },\r
     },\r
@@ -417,12 +272,6 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
@@ -436,8 +285,6 @@
         },\r
         link: {\r
           type: 'none',\r
-          args: {\r
-          },\r
         },\r
       },\r
     },\r
@@ -458,28 +305,10 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
-      type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-        link: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-      },\r
+      type: 'none',\r
     },\r
     summary: {\r
       type: 'template',\r
@@ -498,23 +327,11 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
-        },\r
         link: {\r
           type: 'none',\r
         },\r
@@ -540,12 +357,6 @@
     caption: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
-        },\r
         link: {\r
           type: 'none',\r
         },\r
@@ -568,12 +379,6 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
@@ -582,7 +387,7 @@
         face: {\r
           type: 'method',\r
           args: {\r
-            name: 'revision',\r
+            method_name: 'revision',\r
           },\r
         },\r
         link: {\r
@@ -613,12 +418,6 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
@@ -630,12 +429,6 @@
             name: 'revision',\r
           },\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     summary: {\r
@@ -655,18 +448,10 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
       type: 'none',\r
-      args: {\r
-      },\r
     },\r
     summary: {\r
       type: 'template',\r
@@ -685,30 +470,10 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     summary: {\r
       type: 'none',\r
@@ -720,34 +485,9 @@
   writing_format: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     summary: {\r
       type: 'none',\r
@@ -759,27 +499,10 @@
   license_group: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
       args: {\r
-        face: {\r
-          type: 'column',\r
-          args: {\r
-            name: 'caption',\r
-          },\r
-        },\r
         link: {\r
           type: 'url_column',\r
           args: {\r
@@ -800,17 +523,6 @@
   license: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
@@ -818,7 +530,7 @@
         face: {\r
           type: 'method',\r
           args: {\r
-            name: 'caption_with_group',\r
+            method_name: 'caption_with_group',\r
           },\r
         },\r
         link: {\r
@@ -842,17 +554,6 @@
   author: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
@@ -863,12 +564,6 @@
             name: 'name',\r
           },\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     summary: {\r
@@ -884,17 +579,6 @@
   artist: {\r
     symbol: {\r
       type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'image',\r
-        },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
-      },\r
     },\r
     caption: {\r
       type: 'default',\r
@@ -905,12 +589,6 @@
             name: 'name',\r
           },\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     summary: {\r
@@ -930,28 +608,10 @@
         face: {\r
           type: 'picture',\r
         },\r
-        link: {\r
-          type: 'action'\r
-          args: {\r
-            name: 'show',\r
-          },\r
-        },\r
       },\r
     },\r
     caption: {\r
-      type: 'default',\r
-      args: {\r
-        face: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-        link: {\r
-          type: 'none',\r
-          args: {\r
-          },\r
-        },\r
-      },\r
+      type: 'none',\r
     },\r
     summary: {\r
       type: 'none',\r

diff --git a/app/assets/javascripts/manifest/work/lists.js.coffee.erb b/app/assets/javascripts/manifest/work/lists.js.coffee.erb
index 457f61d..40512be 100644 (file)
--- a/app/assets/javascripts/manifest/work/lists.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/lists.js.coffee.erb
@@ -6,22 +6,23 @@
     private_list: {\r
     },\r
     by_author: {\r
-      type: 'filter',\r
-      args: {\r
-        filter_item_name: 'author',\r
-        filter_key: 'author_id',\r
-      },\r
+      where: 'author',\r
+      includes: 'author_id',\r
     },\r
     by_panel: {\r
       type: 'through_filter',\r
-      from: 'panel',\r
-      through: 'scroll_panels',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        through: 'scroll_panels',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
     play: {\r
       type: 'play',\r
-      model: 'scroll_panel',\r
-      filter_key: 'scroll_id',\r
+      args: {\r
+        model: 'scroll_panel',\r
+        filter_key: 'scroll_id',\r
+      },\r
     },\r
   },\r
   scroll_panel: {\r
@@ -31,13 +32,17 @@
     },\r
     by_scroll: {\r
       type: 'filter',\r
-      from: 'scroll',\r
-      filter_key: 'scroll_id',\r
+      args: {\r
+        from: 'scroll',\r
+        filter_key: 'scroll_id',\r
+      },\r
     },\r
     by_panel: {\r
       type: 'filter',\r
-      from: 'panel',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
   },\r
   comic: {\r
@@ -47,8 +52,10 @@
     },\r
     by_author: {\r
       type: 'filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      args: {\r
+        from: 'author',\r
+        filter_key: 'author_id',\r
+      },\r
     },\r
   },\r
   story: {\r
@@ -58,24 +65,32 @@
     },\r
     by_comic: {\r
       type: 'filter',\r
-      from: 'comic',\r
-      filter_key: 'comic_id',\r
+      args: {\r
+        from: 'comic',\r
+        filter_key: 'comic_id',\r
+      },\r
     },\r
     by_sheet: {\r
       type: 'through_filter',\r
-      from: 'sheet',\r
-      through: 'story_sheets',\r
-      filter_key: 'sheet_id',\r
+      args: {\r
+        from: 'sheet',\r
+        through: 'story_sheets',\r
+        filter_key: 'sheet_id',\r
+      },\r
     },\r
     by_author: {\r
       type: 'element_filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      args: {\r
+        from: 'author',\r
+        filter_key: 'author_id',\r
+      },\r
     },\r
     play: {\r
       type: 'play',\r
-      model: 'story_sheet',\r
-      filter_key: 'story_id',\r
+      args: {\r
+        model: 'story_sheet',\r
+        filter_key: 'story_id',\r
+      },\r
     },\r
   },\r
   story_sheet: {\r
@@ -87,13 +102,17 @@
     },\r
     by_story: {\r
       type: 'filter',\r
-      from: 'story',\r
-      filter_key: 'story_id',\r
+      args: {\r
+        from: 'story',\r
+        filter_key: 'story_id',\r
+      },\r
     },\r
     by_sheet: {\r
       type: 'filter',\r
-      from: 'sheet',\r
-      filter_key: 'sheet_id',\r
+      args: {\r
+        from: 'sheet',\r
+        filter_key: 'sheet_id',\r
+      },\r
     },\r
   },\r
   sheet: {\r
@@ -103,25 +122,33 @@
     },\r
     by_story: {\r
       type: 'through_filter',\r
-      from: 'story',\r
-      through: 'story_sheets',\r
-      filter_key: 'story_id',\r
+      args: {\r
+        from: 'story',\r
+        through: 'story_sheets',\r
+        filter_key: 'story_id',\r
+      },\r
     },\r
     by_panel: {\r
       type: 'through_filter',\r
-      from: 'panel',\r
-      through: 'sheet_panels',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        through: 'sheet_panels',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
     by_author: {\r
       type: 'filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      args: {\r
+        from: 'author',\r
+        filter_key: 'author_id',\r
+      },\r
     },\r
     play: {\r
       type: 'play',\r
-      model: 'sheet_panel',\r
-      filter_key: 'sheet_id',\r
+      args: {\r
+        model: 'sheet_panel',\r
+        filter_key: 'sheet_id',\r
+      },\r
     },\r
   },\r
   sheet_panel: {\r
@@ -131,14 +158,18 @@
     },\r
     by_sheet: {\r
       type: 'filter',\r
-      association_name: 'sheet_panels',\r
-      from: 'sheet',\r
-      filter_key: 'sheet_id',\r
+      args: {\r
+        association_name: 'sheet_panels',\r
+        from: 'sheet',\r
+        filter_key: 'sheet_id',\r
+      },\r
     },\r
     by_panel: {\r
       type: 'filter',\r
-      from: 'panel',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
   },\r
   panel: {\r
@@ -148,26 +179,34 @@
     },\r
     by_scroll: {\r
       type: 'through_filter',\r
-      from: 'scroll',\r
-      through: 'scroll_panels',\r
-      filter_key: 'scroll_id',\r
+      args: {\r
+        from: 'scroll',\r
+        through: 'scroll_panels',\r
+        filter_key: 'scroll_id',\r
+      },\r
     },\r
     by_sheet: {\r
       type: 'through_filter',\r
-      from: 'sheet',\r
-      through: 'sheet_panels',\r
-      filter_key: 'sheet_id',\r
+      args: {\r
+        from: 'sheet',\r
+        through: 'sheet_panels',\r
+        filter_key: 'sheet_id',\r
+      },\r
     },\r
     by_author: {\r
       type: 'filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      args: {\r
+        from: 'author',\r
+        filter_key: 'author_id',\r
+      },\r
     },\r
     by_speech_balloon_template: {\r
       type: 'through_filter',\r
-      from: 'speech_balloon_template',\r
-      through: 'speech_balloons',\r
-      filter_key: 'speech_balloon_template_id',\r
+      args: {\r
+        from: 'speech_balloon_template',\r
+        through: 'speech_balloons',\r
+        filter_key: 'speech_balloon_template_id',\r
+      },\r
     },\r
   },\r
   panel_picture: {\r
@@ -177,13 +216,14 @@
     },\r
     by_panel: {\r
       type: 'filter',\r
-      from: 'panel',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
     by_author: {\r
-      type: 'element_filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      where: 'by_author_where',\r
+      includes: 'by_author_includes',\r
     },\r
   },\r
   speech_balloon: {\r
@@ -193,18 +233,24 @@
     },\r
     by_panel: {\r
       type: 'filter',\r
-      from: 'panel',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
     by_speech_balloon_template: {\r
       type: 'filter',\r
-      from: 'speech_balloon_template',\r
-      filter_key: 'speech_balloon_template_id',\r
+      args: {\r
+        from: 'speech_balloon_template',\r
+        filter_key: 'speech_balloon_template_id',\r
+      },\r
     },\r
     by_author: {\r
       type: 'element_filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      args: {\r
+        from: 'author',\r
+        filter_key: 'author_id',\r
+      },\r
     },\r
   },\r
   speech: {\r
@@ -212,14 +258,18 @@
     },\r
     by_speech_balloon: {\r
       type: 'filter',\r
-      from: 'speech_balloon',\r
-      includes: {speech_balloon: {panel: {}}},\r
-      filter_key: 'speech_balloon_id',\r
+      args: {\r
+        from: 'speech_balloon',\r
+        includes: {speech_balloon: {panel: {}}},\r
+        filter_key: 'speech_balloon_id',\r
+      },\r
     },\r
     by_writing_format: {\r
       type: 'filter',\r
-      from: 'writing_format',\r
-      filter_key: 'writing_format_id',\r
+      args: {\r
+        from: 'writing_format',\r
+        filter_key: 'writing_format_id',\r
+      },\r
     },\r
   },\r
   balloon: {\r
@@ -227,9 +277,11 @@
     },\r
     by_speech_balloon: {\r
       type: 'filter',\r
-      from: 'speech_balloon',\r
-      includes: {speech_balloon: {panel: {}}},\r
-      filter_key: 'speech_balloon_id',\r
+      args: {\r
+        from: 'speech_balloon',\r
+        includes: {speech_balloon: {panel: {}}},\r
+        filter_key: 'speech_balloon_id',\r
+      },\r
     },\r
     #by_system_picture: {\r
     #  type: 'filter',\r
@@ -245,13 +297,17 @@
     },\r
     by_panel: {\r
       type: 'filter',\r
-      from: 'panel',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
     by_author: {\r
       type: 'element_filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      args: {\r
+        from: 'author',\r
+        filter_key: 'author_id',\r
+      },\r
     },\r
   },\r
   ground_color: {\r
@@ -261,13 +317,17 @@
     },\r
     by_panel: {\r
       type: 'filter',\r
-      from: 'panel',\r
-      filter_key: 'panel_id',\r
+      args: {\r
+        from: 'panel',\r
+        filter_key: 'panel_id',\r
+      },\r
     },\r
     by_author: {\r
       type: 'element_filter',\r
-      from: 'author',\r
-      filter_key: 'author_id',\r
+      args: {\r
+        from: 'author',\r
+        filter_key: 'author_id',\r
+      },\r
     },\r
   },\r
   original_picture: {\r
@@ -283,13 +343,17 @@
     },\r
     by_license: {\r
       type: 'filter',\r
-      from: 'license',\r
-      filter_key: 'license_id',\r
+      args: {\r
+        from: 'license',\r
+        filter_key: 'license_id',\r
+      },\r
     },\r
     by_artist: {\r
       type: 'filter',\r
-      from: 'artist',\r
-      filter_key: 'artist_id',\r
+      args: {\r
+        from: 'artist',\r
+        filter_key: 'artist_id',\r
+      },\r
     },\r
   },\r
   speech_balloon_template: {\r
@@ -307,8 +371,10 @@
     },\r
     by_system_picture: {\r
       type: 'filter',\r
-      from: 'system_picture',\r
-      filter_key: 'system_picture_id',\r
+      args: {\r
+        from: 'system_picture',\r
+        filter_key: 'system_picture_id',\r
+      },\r
     },\r
   },\r
   license_group: {\r
@@ -323,13 +389,17 @@
     },\r
     by_license_group: {\r
       type: 'filter',\r
-      from: 'license_group',\r
-      filter_key: 'license_group_id',\r
+      args: {\r
+        from: 'license_group',\r
+        filter_key: 'license_group_id',\r
+      },\r
     },\r
     by_system_picture: {\r
       type: 'filter',\r
-      from: 'system_picture',\r
-      filter_key: 'system_picture_id',\r
+      args: {\r
+        from: 'system_picture',\r
+        filter_key: 'system_picture_id',\r
+      },\r
     },\r
   },\r
   author: {\r

diff --git a/app/assets/javascripts/manifest/work/models.js.coffee.erb b/app/assets/javascripts/manifest/work/models.js.coffee.erb
index 5e9b60e..c5ad05a 100644 (file)
--- a/app/assets/javascripts/manifest/work/models.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/models.js.coffee.erb
@@ -76,6 +76,10 @@
       },\r
       by_author: {\r
         type: 'filter',\r
+        args: {\r
+          filter_item_name: 'author',\r
+          filter_key: 'author_id',\r
+        },\r
       },\r
       by_panel: {\r
         type: 'through_filter',\r

diff --git a/lib/manifest/filer/caption/default/face.rb b/lib/manifest/filer/caption/default/face.rb
index 530b5f9..fb4faeb 100644 (file)
--- a/lib/manifest/filer/caption/default/face.rb
+++ b/lib/manifest/filer/caption/default/face.rb
@@ -9,7 +9,8 @@ module Manifest
             'column' => ColumnFace, 'method' => MethodFace, 'none' => NoneFace
           }
           def self.factory default_caption, my_manifest
-            type = my_manifest['type'] || 'column'
+            my_manifest['type'] ||= 'column'
+            type = my_manifest['type']
             raise "undefined type for filers > #{default_caption.filer_name} > caption > default > face\n" unless type
             my_class = @@types[type]
             raise "undefined class for filers > #{default_caption.filer_name} > caption > default > face > #{type}\n" unless my_class

diff --git a/lib/manifest/filer/caption/default/face/face.rb b/lib/manifest/filer/caption/default/face/face.rb
index 0459ed2..a5fe270 100644 (file)
--- a/lib/manifest/filer/caption/default/face/face.rb
+++ b/lib/manifest/filer/caption/default/face/face.rb
@@ -40,7 +40,7 @@ module Manifest
             attr :method_name
             def set_default
               super
-              raise "undefined name for filers > #{self.caption.filer.filer_name} > caption > default > face\n" unless @face_manifest['args']['method_name']
+              raise "undefined method_name for filers > #{self.caption.filer.filer_name} > caption > default > face\n" unless @face_manifest['args']['method_name']
             end
             
             def init

diff --git a/lib/manifest/filer/caption/default/link.rb b/lib/manifest/filer/caption/default/link.rb
index aa2f8f1..b287a6a 100644 (file)
--- a/lib/manifest/filer/caption/default/link.rb
+++ b/lib/manifest/filer/caption/default/link.rb
@@ -9,7 +9,8 @@ module Manifest
             'action' => ActionLink, 'none' => NoneLink, 'url_column' => UrlColumnLink
           }
           def self.factory default_caption, my_manifest
-            type = my_manifest['type'] || 'action'
+            my_manifest['type'] ||= 'action'
+            type = my_manifest['type']
             raise "undefined type for filers > #{default_caption.filer_name} > caption > default > link\n" unless type
             my_class = @@types[type]
             raise "undefined class for filers > #{default_caption.filer_name} > caption > default > link > #{type}\n" unless my_class

diff --git a/lib/manifest/filer/symbol/base.rb b/lib/manifest/filer/symbol/base.rb
index 9dbcf56..8d1965a 100644 (file)
--- a/lib/manifest/filer/symbol/base.rb
+++ b/lib/manifest/filer/symbol/base.rb
@@ -21,7 +21,7 @@ module Manifest
         end
         
         def visible?
-          ra
+          raise "undefined visible?\n" unless my_class
         end
         
         def filer_name

diff --git a/lib/manifest/filer/symbol/default/face.rb b/lib/manifest/filer/symbol/default/face.rb
index ae4c10d..1f4f582 100644 (file)
--- a/lib/manifest/filer/symbol/default/face.rb
+++ b/lib/manifest/filer/symbol/default/face.rb
@@ -9,7 +9,8 @@ module Manifest
             'image' => ImageFace, 'picture' => PictureFace
           }
           def self.factory default_symbol, my_manifest
-            type = my_manifest['type'] || 'image'
+            my_manifest['type'] ||= 'image'
+            type = my_manifest['type']
             raise "undefined type for filers > #{default_symbol.filer_name} > symbol > default > face\n" unless type
             my_class = @@types[type]
             raise "undefined class for filers > #{default_symbol.filer_name} > symbol > default > face > #{type}\n" unless my_class

diff --git a/lib/manifest/filer/symbol/default/link.rb b/lib/manifest/filer/symbol/default/link.rb
index c6635ff..b75a2fe 100644 (file)
--- a/lib/manifest/filer/symbol/default/link.rb
+++ b/lib/manifest/filer/symbol/default/link.rb
@@ -9,7 +9,8 @@ module Manifest
             'action' => ActionLink, 'none' => NoneLink, 'url_column' => UrlColumnLink
           }
           def self.factory default_symbol, my_manifest
-            type = my_manifest['type'] || 'action'
+            my_manifest['type'] ||= 'action'
+            type = my_manifest['type']
             raise "undefined type for filers > #{default_symbol.filer_name} > symbol > default > link\n" unless type
             my_class = @@types[type]
             raise "undefined class for filers > #{default_symbol.filer_name} > symbol > default > link > #{type}\n" unless my_class

diff --git a/public/manifest.json b/public/manifest.json
index b6a4e14..c2c6f2e 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -3904,18 +3904,7 @@
     "filers": {\r
       "scroll": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
@@ -3949,27 +3938,13 @@
         "symbol": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
             "link": {\r
-              "type": "none",\r
-              "args": {}\r
+              "type": "none"\r
             }\r
           }\r
         },\r
         "caption": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "none",\r
-              "args": {}\r
-            },\r
-            "link": {\r
-              "type": "none",\r
-              "args": {}\r
-            }\r
-          }\r
+          "type": "none"\r
         },\r
         "summary": {\r
           "type": "template",\r
@@ -3983,18 +3958,7 @@
       },\r
       "comic": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
@@ -4004,12 +3968,6 @@
               "args": {\r
                 "name": "title"\r
               }\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4025,18 +3983,7 @@
       },\r
       "story": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
@@ -4044,7 +3991,7 @@
             "face": {\r
               "type": "method",\r
               "args": {\r
-                "name": "title_with_t"\r
+                "method_name": "title_with_t"\r
               }\r
             },\r
             "link": {\r
@@ -4069,27 +4016,13 @@
         "symbol": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
             "link": {\r
-              "type": "none",\r
-              "args": {}\r
+              "type": "none"\r
             }\r
           }\r
         },\r
         "caption": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "none",\r
-              "args": {}\r
-            },\r
-            "link": {\r
-              "type": "none",\r
-              "args": {}\r
-            }\r
-          }\r
+          "type": "none"\r
         },\r
         "summary": {\r
           "type": "template",\r
@@ -4103,27 +4036,13 @@
       },\r
       "sheet": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
           "args": {\r
             "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
+              "type": "column"\r
             },\r
             "link": {\r
               "type": "action",\r
@@ -4147,27 +4066,13 @@
         "symbol": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
             "link": {\r
-              "type": "none",\r
-              "args": {}\r
+              "type": "none"\r
             }\r
           }\r
         },\r
         "caption": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "none",\r
-              "args": {}\r
-            },\r
-            "link": {\r
-              "type": "none",\r
-              "args": {}\r
-            }\r
-          }\r
+          "type": "none"\r
         },\r
         "summary": {\r
           "type": "template",\r
@@ -4181,31 +4086,13 @@
       },\r
       "panel": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
-            },\r
             "link": {\r
-              "type": "none",\r
-              "args": {}\r
+              "type": "none"\r
             }\r
           }\r
         },\r
@@ -4225,27 +4112,14 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
         "caption": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
-            },\r
             "link": {\r
-              "type": "none",\r
-              "args": {}\r
+              "type": "none"\r
             }\r
           }\r
         },\r
@@ -4265,12 +4139,6 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4280,12 +4148,11 @@
             "face": {\r
               "type": "method",\r
               "args": {\r
-                "name": "plain_scenario"\r
+                "method_name": "plain_scenario"\r
               }\r
             },\r
             "link": {\r
-              "type": "none",\r
-              "args": {}\r
+              "type": "none"\r
             }\r
           }\r
         },\r
@@ -4305,12 +4172,6 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4324,8 +4185,7 @@
               }\r
             },\r
             "link": {\r
-              "type": "none",\r
-              "args": {}\r
+              "type": "none"\r
             }\r
           }\r
         },\r
@@ -4345,27 +4205,11 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
         "caption": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "none",\r
-              "args": {}\r
-            },\r
-            "link": {\r
-              "type": "none",\r
-              "args": {}\r
-            }\r
-          }\r
+          "type": "none"\r
         },\r
         "summary": {\r
           "type": "template",\r
@@ -4383,24 +4227,12 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
         "caption": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
-            },\r
             "link": {\r
               "type": "none"\r
             }\r
@@ -4426,12 +4258,6 @@
         "caption": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
-            },\r
             "link": {\r
               "type": "none"\r
             }\r
@@ -4453,12 +4279,6 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4468,7 +4288,7 @@
             "face": {\r
               "type": "method",\r
               "args": {\r
-                "name": "revision"\r
+                "method_name": "revision"\r
               }\r
             },\r
             "link": {\r
@@ -4498,12 +4318,6 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4515,12 +4329,6 @@
               "args": {\r
                 "name": "revision"\r
               }\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4540,18 +4348,11 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
         "caption": {\r
-          "type": "none",\r
-          "args": {}\r
+          "type": "none"\r
         },\r
         "summary": {\r
           "type": "template",\r
@@ -4569,31 +4370,11 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
         "caption": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "summary": {\r
           "type": "none"\r
@@ -4604,35 +4385,10 @@
       },\r
       "writing_format": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "summary": {\r
           "type": "none"\r
@@ -4643,28 +4399,11 @@
       },\r
       "license_group": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
           "args": {\r
-            "face": {\r
-              "type": "column",\r
-              "args": {\r
-                "name": "caption"\r
-              }\r
-            },\r
             "link": {\r
               "type": "url_column",\r
               "args": {\r
@@ -4683,18 +4422,7 @@
       },\r
       "license": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
@@ -4702,7 +4430,7 @@
             "face": {\r
               "type": "method",\r
               "args": {\r
-                "name": "caption_with_group"\r
+                "method_name": "caption_with_group"\r
               }\r
             },\r
             "link": {\r
@@ -4725,18 +4453,7 @@
       },\r
       "author": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
@@ -4746,12 +4463,6 @@
               "args": {\r
                 "name": "name"\r
               }\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4767,18 +4478,7 @@
       },\r
       "artist": {\r
         "symbol": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "image"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
-            }\r
-          }\r
+          "type": "default"\r
         },\r
         "caption": {\r
           "type": "default",\r
@@ -4788,12 +4488,6 @@
               "args": {\r
                 "name": "name"\r
               }\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
@@ -4813,27 +4507,11 @@
           "args": {\r
             "face": {\r
               "type": "picture"\r
-            },\r
-            "link": {\r
-              "type": "action",\r
-              "args": {\r
-                "name": "show"\r
-              }\r
             }\r
           }\r
         },\r
         "caption": {\r
-          "type": "default",\r
-          "args": {\r
-            "face": {\r
-              "type": "none",\r
-              "args": {}\r
-            },\r
-            "link": {\r
-              "type": "none",\r
-              "args": {}\r
-            }\r
-          }\r
+          "type": "none"\r
         },\r
         "summary": {\r
           "type": "none"\r
@@ -4856,14 +4534,18 @@
         },\r
         "by_panel": {\r
           "type": "through_filter",\r
-          "from": "panel",\r
-          "through": "scroll_panels",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "through": "scroll_panels",\r
+            "filter_key": "panel_id"\r
+          }\r
         },\r
         "play": {\r
           "type": "play",\r
-          "model": "scroll_panel",\r
-          "filter_key": "scroll_id"\r
+          "args": {\r
+            "model": "scroll_panel",\r
+            "filter_key": "scroll_id"\r
+          }\r
         }\r
       },\r
       "scroll_panel": {\r
@@ -4871,13 +4553,17 @@
         "private_list": {},\r
         "by_scroll": {\r
           "type": "filter",\r
-          "from": "scroll",\r
-          "filter_key": "scroll_id"\r
+          "args": {\r
+            "from": "scroll",\r
+            "filter_key": "scroll_id"\r
+          }\r
         },\r
         "by_panel": {\r
           "type": "filter",\r
-          "from": "panel",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "filter_key": "panel_id"\r
+          }\r
         }\r
       },\r
       "comic": {\r
@@ -4885,8 +4571,10 @@
         "private_list": {},\r
         "by_author": {\r
           "type": "filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         }\r
       },\r
       "story": {\r
@@ -4894,24 +4582,32 @@
         "private_list": {},\r
         "by_comic": {\r
           "type": "filter",\r
-          "from": "comic",\r
-          "filter_key": "comic_id"\r
+          "args": {\r
+            "from": "comic",\r
+            "filter_key": "comic_id"\r
+          }\r
         },\r
         "by_sheet": {\r
           "type": "through_filter",\r
-          "from": "sheet",\r
-          "through": "story_sheets",\r
-          "filter_key": "sheet_id"\r
+          "args": {\r
+            "from": "sheet",\r
+            "through": "story_sheets",\r
+            "filter_key": "sheet_id"\r
+          }\r
         },\r
         "by_author": {\r
           "type": "element_filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         },\r
         "play": {\r
           "type": "play",\r
-          "model": "story_sheet",\r
-          "filter_key": "story_id"\r
+          "args": {\r
+            "model": "story_sheet",\r
+            "filter_key": "story_id"\r
+          }\r
         }\r
       },\r
       "story_sheet": {\r
@@ -4923,13 +4619,17 @@
         },\r
         "by_story": {\r
           "type": "filter",\r
-          "from": "story",\r
-          "filter_key": "story_id"\r
+          "args": {\r
+            "from": "story",\r
+            "filter_key": "story_id"\r
+          }\r
         },\r
         "by_sheet": {\r
           "type": "filter",\r
-          "from": "sheet",\r
-          "filter_key": "sheet_id"\r
+          "args": {\r
+            "from": "sheet",\r
+            "filter_key": "sheet_id"\r
+          }\r
         }\r
       },\r
       "sheet": {\r
@@ -4937,25 +4637,33 @@
         "private_list": {},\r
         "by_story": {\r
           "type": "through_filter",\r
-          "from": "story",\r
-          "through": "story_sheets",\r
-          "filter_key": "story_id"\r
+          "args": {\r
+            "from": "story",\r
+            "through": "story_sheets",\r
+            "filter_key": "story_id"\r
+          }\r
         },\r
         "by_panel": {\r
           "type": "through_filter",\r
-          "from": "panel",\r
-          "through": "sheet_panels",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "through": "sheet_panels",\r
+            "filter_key": "panel_id"\r
+          }\r
         },\r
         "by_author": {\r
           "type": "filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         },\r
         "play": {\r
           "type": "play",\r
-          "model": "sheet_panel",\r
-          "filter_key": "sheet_id"\r
+          "args": {\r
+            "model": "sheet_panel",\r
+            "filter_key": "sheet_id"\r
+          }\r
         }\r
       },\r
       "sheet_panel": {\r
@@ -4963,14 +4671,18 @@
         "private_list": {},\r
         "by_sheet": {\r
           "type": "filter",\r
-          "association_name": "sheet_panels",\r
-          "from": "sheet",\r
-          "filter_key": "sheet_id"\r
+          "args": {\r
+            "association_name": "sheet_panels",\r
+            "from": "sheet",\r
+            "filter_key": "sheet_id"\r
+          }\r
         },\r
         "by_panel": {\r
           "type": "filter",\r
-          "from": "panel",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "filter_key": "panel_id"\r
+          }\r
         }\r
       },\r
       "panel": {\r
@@ -4978,26 +4690,34 @@
         "private_list": {},\r
         "by_scroll": {\r
           "type": "through_filter",\r
-          "from": "scroll",\r
-          "through": "scroll_panels",\r
-          "filter_key": "scroll_id"\r
+          "args": {\r
+            "from": "scroll",\r
+            "through": "scroll_panels",\r
+            "filter_key": "scroll_id"\r
+          }\r
         },\r
         "by_sheet": {\r
           "type": "through_filter",\r
-          "from": "sheet",\r
-          "through": "sheet_panels",\r
-          "filter_key": "sheet_id"\r
+          "args": {\r
+            "from": "sheet",\r
+            "through": "sheet_panels",\r
+            "filter_key": "sheet_id"\r
+          }\r
         },\r
         "by_author": {\r
           "type": "filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         },\r
         "by_speech_balloon_template": {\r
           "type": "through_filter",\r
-          "from": "speech_balloon_template",\r
-          "through": "speech_balloons",\r
-          "filter_key": "speech_balloon_template_id"\r
+          "args": {\r
+            "from": "speech_balloon_template",\r
+            "through": "speech_balloons",\r
+            "filter_key": "speech_balloon_template_id"\r
+          }\r
         }\r
       },\r
       "panel_picture": {\r
@@ -5005,13 +4725,17 @@
         "private_list": {},\r
         "by_panel": {\r
           "type": "filter",\r
-          "from": "panel",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "filter_key": "panel_id"\r
+          }\r
         },\r
         "by_author": {\r
           "type": "element_filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         }\r
       },\r
       "speech_balloon": {\r
@@ -5019,49 +4743,61 @@
         "private_list": {},\r
         "by_panel": {\r
           "type": "filter",\r
-          "from": "panel",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "filter_key": "panel_id"\r
+          }\r
         },\r
         "by_speech_balloon_template": {\r
           "type": "filter",\r
-          "from": "speech_balloon_template",\r
-          "filter_key": "speech_balloon_template_id"\r
+          "args": {\r
+            "from": "speech_balloon_template",\r
+            "filter_key": "speech_balloon_template_id"\r
+          }\r
         },\r
         "by_author": {\r
           "type": "element_filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         }\r
       },\r
       "speech": {\r
         "public_list": {},\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
+          "args": {\r
+            "from": "speech_balloon",\r
+            "includes": {\r
+              "speech_balloon": {\r
+                "panel": {}\r
+              }\r
+            },\r
+            "filter_key": "speech_balloon_id"\r
+          }\r
         },\r
         "by_writing_format": {\r
           "type": "filter",\r
-          "from": "writing_format",\r
-          "filter_key": "writing_format_id"\r
+          "args": {\r
+            "from": "writing_format",\r
+            "filter_key": "writing_format_id"\r
+          }\r
         }\r
       },\r
       "balloon": {\r
         "public_list": {},\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
+          "args": {\r
+            "from": "speech_balloon",\r
+            "includes": {\r
+              "speech_balloon": {\r
+                "panel": {}\r
+              }\r
+            },\r
+            "filter_key": "speech_balloon_id"\r
+          }\r
         }\r
       },\r
       "ground_picture": {\r
@@ -5071,13 +4807,17 @@
         },\r
         "by_panel": {\r
           "type": "filter",\r
-          "from": "panel",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "filter_key": "panel_id"\r
+          }\r
         },\r
         "by_author": {\r
           "type": "element_filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         }\r
       },\r
       "ground_color": {\r
@@ -5085,13 +4825,17 @@
         "private_list": {},\r
         "by_panel": {\r
           "type": "filter",\r
-          "from": "panel",\r
-          "filter_key": "panel_id"\r
+          "args": {\r
+            "from": "panel",\r
+            "filter_key": "panel_id"\r
+          }\r
         },\r
         "by_author": {\r
           "type": "element_filter",\r
-          "from": "author",\r
-          "filter_key": "author_id"\r
+          "args": {\r
+            "from": "author",\r
+            "filter_key": "author_id"\r
+          }\r
         }\r
       },\r
       "original_picture": {\r
@@ -5103,13 +4847,17 @@
         "private_list": {},\r
         "by_license": {\r
           "type": "filter",\r
-          "from": "license",\r
-          "filter_key": "license_id"\r
+          "args": {\r
+            "from": "license",\r
+            "filter_key": "license_id"\r
+          }\r
         },\r
         "by_artist": {\r
           "type": "filter",\r
-          "from": "artist",\r
-          "filter_key": "artist_id"\r
+          "args": {\r
+            "from": "artist",\r
+            "filter_key": "artist_id"\r
+          }\r
         }\r
       },\r
       "speech_balloon_template": {\r
@@ -5125,8 +4873,10 @@
         },\r
         "by_system_picture": {\r
           "type": "filter",\r
-          "from": "system_picture",\r
-          "filter_key": "system_picture_id"\r
+          "args": {\r
+            "from": "system_picture",\r
+            "filter_key": "system_picture_id"\r
+          }\r
         }\r
       },\r
       "license_group": {\r
@@ -5139,13 +4889,17 @@
         "public_list": {},\r
         "by_license_group": {\r
           "type": "filter",\r
-          "from": "license_group",\r
-          "filter_key": "license_group_id"\r
+          "args": {\r
+            "from": "license_group",\r
+            "filter_key": "license_group_id"\r
+          }\r
         },\r
         "by_system_picture": {\r
           "type": "filter",\r
-          "from": "system_picture",\r
-          "filter_key": "system_picture_id"\r
+          "args": {\r
+            "from": "system_picture",\r
+            "filter_key": "system_picture_id"\r
+          }\r
         }\r
       },\r
       "author": {\r