From 1bba09932bddac9e58c94ac0eb872598fe07e2c7 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Fri, 7 Feb 2014 08:26:22 +0900 Subject: [PATCH] fix manifest --- .../javascripts/manifest/work/filers.js.coffee.erb | 358 +----------- .../javascripts/manifest/work/lists.js.coffee.erb | 254 +++++--- .../javascripts/manifest/work/models.js.coffee.erb | 4 + lib/manifest/filer/caption/default/face.rb | 3 +- lib/manifest/filer/caption/default/face/face.rb | 2 +- lib/manifest/filer/caption/default/link.rb | 3 +- lib/manifest/filer/symbol/base.rb | 2 +- lib/manifest/filer/symbol/default/face.rb | 3 +- lib/manifest/filer/symbol/default/link.rb | 3 +- public/manifest.json | 646 +++++++-------------- 10 files changed, 385 insertions(+), 893 deletions(-) diff --git a/app/assets/javascripts/manifest/work/filers.js.coffee.erb b/app/assets/javascripts/manifest/work/filers.js.coffee.erb index afdd387f..b45fad6e 100644 --- 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: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', @@ -48,30 +37,13 @@ symbol: { type: 'default', args: { - face: { - type: 'image', - }, link: { type: 'none', - args: { - }, }, }, }, caption: { - type: 'default', - args: { - face: { - type: 'none', - args: { - }, - }, - link: { - type: 'none', - args: { - }, - }, - }, + type: 'none', }, summary: { type: 'template', @@ -86,17 +58,6 @@ comic: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', @@ -107,12 +68,6 @@ name: 'title', }, }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, summary: { @@ -128,17 +83,6 @@ story: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', @@ -146,7 +90,7 @@ face: { type: 'method', args: { - name: 'title_with_t', + method_name: 'title_with_t', }, }, link: { @@ -171,30 +115,13 @@ symbol: { type: 'default', args: { - face: { - type: 'image', - }, link: { type: 'none', - args: { - }, }, }, }, caption: { - type: 'default', - args: { - face: { - type: 'none', - args: { - }, - }, - link: { - type: 'none', - args: { - }, - }, - }, + type: 'none', }, summary: { type: 'template', @@ -209,26 +136,12 @@ sheet: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', args: { face: { type: 'column', - args: { - name: 'caption', - }, }, link: { type: 'action' @@ -252,30 +165,13 @@ symbol: { type: 'default', args: { - face: { - type: 'image', - }, link: { type: 'none', - args: { - }, }, }, }, caption: { - type: 'default', - args: { - face: { - type: 'none', - args: { - }, - }, - link: { - type: 'none', - args: { - }, - }, - }, + type: 'none', }, summary: { type: 'template', @@ -290,31 +186,12 @@ panel: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', args: { - face: { - type: 'column', - args: { - name: 'caption', - }, - }, link: { type: 'none', - args: { - }, }, }, }, @@ -335,27 +212,13 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { type: 'default', args: { - face: { - type: 'column', - args: { - name: 'caption', - }, - }, link: { type: 'none', - args: { - }, }, }, }, @@ -376,12 +239,6 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { @@ -390,13 +247,11 @@ face: { type: 'method', args: { - name: 'plain_scenario', + method_name: 'plain_scenario', }, }, link: { type: 'none', - args: { - }, }, }, }, @@ -417,12 +272,6 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { @@ -436,8 +285,6 @@ }, link: { type: 'none', - args: { - }, }, }, }, @@ -458,28 +305,10 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { - type: 'default', - args: { - face: { - type: 'none', - args: { - }, - }, - link: { - type: 'none', - args: { - }, - }, - }, + type: 'none', }, summary: { type: 'template', @@ -498,23 +327,11 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { type: 'default', args: { - face: { - type: 'column', - args: { - name: 'caption', - }, - }, link: { type: 'none', }, @@ -540,12 +357,6 @@ caption: { type: 'default', args: { - face: { - type: 'column', - args: { - name: 'caption', - }, - }, link: { type: 'none', }, @@ -568,12 +379,6 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { @@ -582,7 +387,7 @@ face: { type: 'method', args: { - name: 'revision', + method_name: 'revision', }, }, link: { @@ -613,12 +418,6 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { @@ -630,12 +429,6 @@ name: 'revision', }, }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, summary: { @@ -655,18 +448,10 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { type: 'none', - args: { - }, }, summary: { type: 'template', @@ -685,30 +470,10 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { type: 'default', - args: { - face: { - type: 'column', - args: { - name: 'caption', - }, - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, summary: { type: 'none', @@ -720,34 +485,9 @@ writing_format: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', - args: { - face: { - type: 'column', - args: { - name: 'caption', - }, - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, summary: { type: 'none', @@ -759,27 +499,10 @@ license_group: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', args: { - face: { - type: 'column', - args: { - name: 'caption', - }, - }, link: { type: 'url_column', args: { @@ -800,17 +523,6 @@ license: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', @@ -818,7 +530,7 @@ face: { type: 'method', args: { - name: 'caption_with_group', + method_name: 'caption_with_group', }, }, link: { @@ -842,17 +554,6 @@ author: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', @@ -863,12 +564,6 @@ name: 'name', }, }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, summary: { @@ -884,17 +579,6 @@ artist: { symbol: { type: 'default', - args: { - face: { - type: 'image', - }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, - }, }, caption: { type: 'default', @@ -905,12 +589,6 @@ name: 'name', }, }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, summary: { @@ -930,28 +608,10 @@ face: { type: 'picture', }, - link: { - type: 'action' - args: { - name: 'show', - }, - }, }, }, caption: { - type: 'default', - args: { - face: { - type: 'none', - args: { - }, - }, - link: { - type: 'none', - args: { - }, - }, - }, + type: 'none', }, summary: { type: 'none', diff --git a/app/assets/javascripts/manifest/work/lists.js.coffee.erb b/app/assets/javascripts/manifest/work/lists.js.coffee.erb index 457f61d5..40512be4 100644 --- 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: { }, by_author: { - type: 'filter', - args: { - filter_item_name: 'author', - filter_key: 'author_id', - }, + where: 'author', + includes: 'author_id', }, by_panel: { type: 'through_filter', - from: 'panel', - through: 'scroll_panels', - filter_key: 'panel_id', + args: { + from: 'panel', + through: 'scroll_panels', + filter_key: 'panel_id', + }, }, play: { type: 'play', - model: 'scroll_panel', - filter_key: 'scroll_id', + args: { + model: 'scroll_panel', + filter_key: 'scroll_id', + }, }, }, scroll_panel: { @@ -31,13 +32,17 @@ }, by_scroll: { type: 'filter', - from: 'scroll', - filter_key: 'scroll_id', + args: { + from: 'scroll', + filter_key: 'scroll_id', + }, }, by_panel: { type: 'filter', - from: 'panel', - filter_key: 'panel_id', + args: { + from: 'panel', + filter_key: 'panel_id', + }, }, }, comic: { @@ -47,8 +52,10 @@ }, by_author: { type: 'filter', - from: 'author', - filter_key: 'author_id', + args: { + from: 'author', + filter_key: 'author_id', + }, }, }, story: { @@ -58,24 +65,32 @@ }, by_comic: { type: 'filter', - from: 'comic', - filter_key: 'comic_id', + args: { + from: 'comic', + filter_key: 'comic_id', + }, }, by_sheet: { type: 'through_filter', - from: 'sheet', - through: 'story_sheets', - filter_key: 'sheet_id', + args: { + from: 'sheet', + through: 'story_sheets', + filter_key: 'sheet_id', + }, }, by_author: { type: 'element_filter', - from: 'author', - filter_key: 'author_id', + args: { + from: 'author', + filter_key: 'author_id', + }, }, play: { type: 'play', - model: 'story_sheet', - filter_key: 'story_id', + args: { + model: 'story_sheet', + filter_key: 'story_id', + }, }, }, story_sheet: { @@ -87,13 +102,17 @@ }, by_story: { type: 'filter', - from: 'story', - filter_key: 'story_id', + args: { + from: 'story', + filter_key: 'story_id', + }, }, by_sheet: { type: 'filter', - from: 'sheet', - filter_key: 'sheet_id', + args: { + from: 'sheet', + filter_key: 'sheet_id', + }, }, }, sheet: { @@ -103,25 +122,33 @@ }, by_story: { type: 'through_filter', - from: 'story', - through: 'story_sheets', - filter_key: 'story_id', + args: { + from: 'story', + through: 'story_sheets', + filter_key: 'story_id', + }, }, by_panel: { type: 'through_filter', - from: 'panel', - through: 'sheet_panels', - filter_key: 'panel_id', + args: { + from: 'panel', + through: 'sheet_panels', + filter_key: 'panel_id', + }, }, by_author: { type: 'filter', - from: 'author', - filter_key: 'author_id', + args: { + from: 'author', + filter_key: 'author_id', + }, }, play: { type: 'play', - model: 'sheet_panel', - filter_key: 'sheet_id', + args: { + model: 'sheet_panel', + filter_key: 'sheet_id', + }, }, }, sheet_panel: { @@ -131,14 +158,18 @@ }, by_sheet: { type: 'filter', - association_name: 'sheet_panels', - from: 'sheet', - filter_key: 'sheet_id', + args: { + association_name: 'sheet_panels', + from: 'sheet', + filter_key: 'sheet_id', + }, }, by_panel: { type: 'filter', - from: 'panel', - filter_key: 'panel_id', + args: { + from: 'panel', + filter_key: 'panel_id', + }, }, }, panel: { @@ -148,26 +179,34 @@ }, by_scroll: { type: 'through_filter', - from: 'scroll', - through: 'scroll_panels', - filter_key: 'scroll_id', + args: { + from: 'scroll', + through: 'scroll_panels', + filter_key: 'scroll_id', + }, }, by_sheet: { type: 'through_filter', - from: 'sheet', - through: 'sheet_panels', - filter_key: 'sheet_id', + args: { + from: 'sheet', + through: 'sheet_panels', + filter_key: 'sheet_id', + }, }, by_author: { type: 'filter', - from: 'author', - filter_key: 'author_id', + args: { + from: 'author', + filter_key: 'author_id', + }, }, by_speech_balloon_template: { type: 'through_filter', - from: 'speech_balloon_template', - through: 'speech_balloons', - filter_key: 'speech_balloon_template_id', + args: { + from: 'speech_balloon_template', + through: 'speech_balloons', + filter_key: 'speech_balloon_template_id', + }, }, }, panel_picture: { @@ -177,13 +216,14 @@ }, by_panel: { type: 'filter', - from: 'panel', - filter_key: 'panel_id', + args: { + from: 'panel', + filter_key: 'panel_id', + }, }, by_author: { - type: 'element_filter', - from: 'author', - filter_key: 'author_id', + where: 'by_author_where', + includes: 'by_author_includes', }, }, speech_balloon: { @@ -193,18 +233,24 @@ }, by_panel: { type: 'filter', - from: 'panel', - filter_key: 'panel_id', + args: { + from: 'panel', + filter_key: 'panel_id', + }, }, by_speech_balloon_template: { type: 'filter', - from: 'speech_balloon_template', - filter_key: 'speech_balloon_template_id', + args: { + from: 'speech_balloon_template', + filter_key: 'speech_balloon_template_id', + }, }, by_author: { type: 'element_filter', - from: 'author', - filter_key: 'author_id', + args: { + from: 'author', + filter_key: 'author_id', + }, }, }, speech: { @@ -212,14 +258,18 @@ }, by_speech_balloon: { type: 'filter', - from: 'speech_balloon', - includes: {speech_balloon: {panel: {}}}, - filter_key: 'speech_balloon_id', + args: { + from: 'speech_balloon', + includes: {speech_balloon: {panel: {}}}, + filter_key: 'speech_balloon_id', + }, }, by_writing_format: { type: 'filter', - from: 'writing_format', - filter_key: 'writing_format_id', + args: { + from: 'writing_format', + filter_key: 'writing_format_id', + }, }, }, balloon: { @@ -227,9 +277,11 @@ }, by_speech_balloon: { type: 'filter', - from: 'speech_balloon', - includes: {speech_balloon: {panel: {}}}, - filter_key: 'speech_balloon_id', + args: { + from: 'speech_balloon', + includes: {speech_balloon: {panel: {}}}, + filter_key: 'speech_balloon_id', + }, }, #by_system_picture: { # type: 'filter', @@ -245,13 +297,17 @@ }, by_panel: { type: 'filter', - from: 'panel', - filter_key: 'panel_id', + args: { + from: 'panel', + filter_key: 'panel_id', + }, }, by_author: { type: 'element_filter', - from: 'author', - filter_key: 'author_id', + args: { + from: 'author', + filter_key: 'author_id', + }, }, }, ground_color: { @@ -261,13 +317,17 @@ }, by_panel: { type: 'filter', - from: 'panel', - filter_key: 'panel_id', + args: { + from: 'panel', + filter_key: 'panel_id', + }, }, by_author: { type: 'element_filter', - from: 'author', - filter_key: 'author_id', + args: { + from: 'author', + filter_key: 'author_id', + }, }, }, original_picture: { @@ -283,13 +343,17 @@ }, by_license: { type: 'filter', - from: 'license', - filter_key: 'license_id', + args: { + from: 'license', + filter_key: 'license_id', + }, }, by_artist: { type: 'filter', - from: 'artist', - filter_key: 'artist_id', + args: { + from: 'artist', + filter_key: 'artist_id', + }, }, }, speech_balloon_template: { @@ -307,8 +371,10 @@ }, by_system_picture: { type: 'filter', - from: 'system_picture', - filter_key: 'system_picture_id', + args: { + from: 'system_picture', + filter_key: 'system_picture_id', + }, }, }, license_group: { @@ -323,13 +389,17 @@ }, by_license_group: { type: 'filter', - from: 'license_group', - filter_key: 'license_group_id', + args: { + from: 'license_group', + filter_key: 'license_group_id', + }, }, by_system_picture: { type: 'filter', - from: 'system_picture', - filter_key: 'system_picture_id', + args: { + from: 'system_picture', + filter_key: 'system_picture_id', + }, }, }, author: { diff --git a/app/assets/javascripts/manifest/work/models.js.coffee.erb b/app/assets/javascripts/manifest/work/models.js.coffee.erb index 5e9b60e7..c5ad05a7 100644 --- a/app/assets/javascripts/manifest/work/models.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/models.js.coffee.erb @@ -76,6 +76,10 @@ }, by_author: { type: 'filter', + args: { + filter_item_name: 'author', + filter_key: 'author_id', + }, }, by_panel: { type: 'through_filter', diff --git a/lib/manifest/filer/caption/default/face.rb b/lib/manifest/filer/caption/default/face.rb index 530b5f9c..fb4faeb9 100644 --- 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 0459ed24..a5fe270f 100644 --- 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 aa2f8f19..b287a6af 100644 --- 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 9dbcf567..8d1965ad 100644 --- 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 ae4c10d8..1f4f582d 100644 --- 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 c6635ffe..b75a2fea 100644 --- 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 b6a4e144..c2c6f2e7 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -3904,18 +3904,7 @@ "filers": { "scroll": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", @@ -3949,27 +3938,13 @@ "symbol": { "type": "default", "args": { - "face": { - "type": "image" - }, "link": { - "type": "none", - "args": {} + "type": "none" } } }, "caption": { - "type": "default", - "args": { - "face": { - "type": "none", - "args": {} - }, - "link": { - "type": "none", - "args": {} - } - } + "type": "none" }, "summary": { "type": "template", @@ -3983,18 +3958,7 @@ }, "comic": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", @@ -4004,12 +3968,6 @@ "args": { "name": "title" } - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4025,18 +3983,7 @@ }, "story": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", @@ -4044,7 +3991,7 @@ "face": { "type": "method", "args": { - "name": "title_with_t" + "method_name": "title_with_t" } }, "link": { @@ -4069,27 +4016,13 @@ "symbol": { "type": "default", "args": { - "face": { - "type": "image" - }, "link": { - "type": "none", - "args": {} + "type": "none" } } }, "caption": { - "type": "default", - "args": { - "face": { - "type": "none", - "args": {} - }, - "link": { - "type": "none", - "args": {} - } - } + "type": "none" }, "summary": { "type": "template", @@ -4103,27 +4036,13 @@ }, "sheet": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", "args": { "face": { - "type": "column", - "args": { - "name": "caption" - } + "type": "column" }, "link": { "type": "action", @@ -4147,27 +4066,13 @@ "symbol": { "type": "default", "args": { - "face": { - "type": "image" - }, "link": { - "type": "none", - "args": {} + "type": "none" } } }, "caption": { - "type": "default", - "args": { - "face": { - "type": "none", - "args": {} - }, - "link": { - "type": "none", - "args": {} - } - } + "type": "none" }, "summary": { "type": "template", @@ -4181,31 +4086,13 @@ }, "panel": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", "args": { - "face": { - "type": "column", - "args": { - "name": "caption" - } - }, "link": { - "type": "none", - "args": {} + "type": "none" } } }, @@ -4225,27 +4112,14 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, "caption": { "type": "default", "args": { - "face": { - "type": "column", - "args": { - "name": "caption" - } - }, "link": { - "type": "none", - "args": {} + "type": "none" } } }, @@ -4265,12 +4139,6 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4280,12 +4148,11 @@ "face": { "type": "method", "args": { - "name": "plain_scenario" + "method_name": "plain_scenario" } }, "link": { - "type": "none", - "args": {} + "type": "none" } } }, @@ -4305,12 +4172,6 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4324,8 +4185,7 @@ } }, "link": { - "type": "none", - "args": {} + "type": "none" } } }, @@ -4345,27 +4205,11 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, "caption": { - "type": "default", - "args": { - "face": { - "type": "none", - "args": {} - }, - "link": { - "type": "none", - "args": {} - } - } + "type": "none" }, "summary": { "type": "template", @@ -4383,24 +4227,12 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, "caption": { "type": "default", "args": { - "face": { - "type": "column", - "args": { - "name": "caption" - } - }, "link": { "type": "none" } @@ -4426,12 +4258,6 @@ "caption": { "type": "default", "args": { - "face": { - "type": "column", - "args": { - "name": "caption" - } - }, "link": { "type": "none" } @@ -4453,12 +4279,6 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4468,7 +4288,7 @@ "face": { "type": "method", "args": { - "name": "revision" + "method_name": "revision" } }, "link": { @@ -4498,12 +4318,6 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4515,12 +4329,6 @@ "args": { "name": "revision" } - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4540,18 +4348,11 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, "caption": { - "type": "none", - "args": {} + "type": "none" }, "summary": { "type": "template", @@ -4569,31 +4370,11 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, "caption": { - "type": "default", - "args": { - "face": { - "type": "column", - "args": { - "name": "caption" - } - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "summary": { "type": "none" @@ -4604,35 +4385,10 @@ }, "writing_format": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { - "type": "default", - "args": { - "face": { - "type": "column", - "args": { - "name": "caption" - } - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "summary": { "type": "none" @@ -4643,28 +4399,11 @@ }, "license_group": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", "args": { - "face": { - "type": "column", - "args": { - "name": "caption" - } - }, "link": { "type": "url_column", "args": { @@ -4683,18 +4422,7 @@ }, "license": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", @@ -4702,7 +4430,7 @@ "face": { "type": "method", "args": { - "name": "caption_with_group" + "method_name": "caption_with_group" } }, "link": { @@ -4725,18 +4453,7 @@ }, "author": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", @@ -4746,12 +4463,6 @@ "args": { "name": "name" } - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4767,18 +4478,7 @@ }, "artist": { "symbol": { - "type": "default", - "args": { - "face": { - "type": "image" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } - } - } + "type": "default" }, "caption": { "type": "default", @@ -4788,12 +4488,6 @@ "args": { "name": "name" } - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, @@ -4813,27 +4507,11 @@ "args": { "face": { "type": "picture" - }, - "link": { - "type": "action", - "args": { - "name": "show" - } } } }, "caption": { - "type": "default", - "args": { - "face": { - "type": "none", - "args": {} - }, - "link": { - "type": "none", - "args": {} - } - } + "type": "none" }, "summary": { "type": "none" @@ -4856,14 +4534,18 @@ }, "by_panel": { "type": "through_filter", - "from": "panel", - "through": "scroll_panels", - "filter_key": "panel_id" + "args": { + "from": "panel", + "through": "scroll_panels", + "filter_key": "panel_id" + } }, "play": { "type": "play", - "model": "scroll_panel", - "filter_key": "scroll_id" + "args": { + "model": "scroll_panel", + "filter_key": "scroll_id" + } } }, "scroll_panel": { @@ -4871,13 +4553,17 @@ "private_list": {}, "by_scroll": { "type": "filter", - "from": "scroll", - "filter_key": "scroll_id" + "args": { + "from": "scroll", + "filter_key": "scroll_id" + } }, "by_panel": { "type": "filter", - "from": "panel", - "filter_key": "panel_id" + "args": { + "from": "panel", + "filter_key": "panel_id" + } } }, "comic": { @@ -4885,8 +4571,10 @@ "private_list": {}, "by_author": { "type": "filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } } }, "story": { @@ -4894,24 +4582,32 @@ "private_list": {}, "by_comic": { "type": "filter", - "from": "comic", - "filter_key": "comic_id" + "args": { + "from": "comic", + "filter_key": "comic_id" + } }, "by_sheet": { "type": "through_filter", - "from": "sheet", - "through": "story_sheets", - "filter_key": "sheet_id" + "args": { + "from": "sheet", + "through": "story_sheets", + "filter_key": "sheet_id" + } }, "by_author": { "type": "element_filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } }, "play": { "type": "play", - "model": "story_sheet", - "filter_key": "story_id" + "args": { + "model": "story_sheet", + "filter_key": "story_id" + } } }, "story_sheet": { @@ -4923,13 +4619,17 @@ }, "by_story": { "type": "filter", - "from": "story", - "filter_key": "story_id" + "args": { + "from": "story", + "filter_key": "story_id" + } }, "by_sheet": { "type": "filter", - "from": "sheet", - "filter_key": "sheet_id" + "args": { + "from": "sheet", + "filter_key": "sheet_id" + } } }, "sheet": { @@ -4937,25 +4637,33 @@ "private_list": {}, "by_story": { "type": "through_filter", - "from": "story", - "through": "story_sheets", - "filter_key": "story_id" + "args": { + "from": "story", + "through": "story_sheets", + "filter_key": "story_id" + } }, "by_panel": { "type": "through_filter", - "from": "panel", - "through": "sheet_panels", - "filter_key": "panel_id" + "args": { + "from": "panel", + "through": "sheet_panels", + "filter_key": "panel_id" + } }, "by_author": { "type": "filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } }, "play": { "type": "play", - "model": "sheet_panel", - "filter_key": "sheet_id" + "args": { + "model": "sheet_panel", + "filter_key": "sheet_id" + } } }, "sheet_panel": { @@ -4963,14 +4671,18 @@ "private_list": {}, "by_sheet": { "type": "filter", - "association_name": "sheet_panels", - "from": "sheet", - "filter_key": "sheet_id" + "args": { + "association_name": "sheet_panels", + "from": "sheet", + "filter_key": "sheet_id" + } }, "by_panel": { "type": "filter", - "from": "panel", - "filter_key": "panel_id" + "args": { + "from": "panel", + "filter_key": "panel_id" + } } }, "panel": { @@ -4978,26 +4690,34 @@ "private_list": {}, "by_scroll": { "type": "through_filter", - "from": "scroll", - "through": "scroll_panels", - "filter_key": "scroll_id" + "args": { + "from": "scroll", + "through": "scroll_panels", + "filter_key": "scroll_id" + } }, "by_sheet": { "type": "through_filter", - "from": "sheet", - "through": "sheet_panels", - "filter_key": "sheet_id" + "args": { + "from": "sheet", + "through": "sheet_panels", + "filter_key": "sheet_id" + } }, "by_author": { "type": "filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } }, "by_speech_balloon_template": { "type": "through_filter", - "from": "speech_balloon_template", - "through": "speech_balloons", - "filter_key": "speech_balloon_template_id" + "args": { + "from": "speech_balloon_template", + "through": "speech_balloons", + "filter_key": "speech_balloon_template_id" + } } }, "panel_picture": { @@ -5005,13 +4725,17 @@ "private_list": {}, "by_panel": { "type": "filter", - "from": "panel", - "filter_key": "panel_id" + "args": { + "from": "panel", + "filter_key": "panel_id" + } }, "by_author": { "type": "element_filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } } }, "speech_balloon": { @@ -5019,49 +4743,61 @@ "private_list": {}, "by_panel": { "type": "filter", - "from": "panel", - "filter_key": "panel_id" + "args": { + "from": "panel", + "filter_key": "panel_id" + } }, "by_speech_balloon_template": { "type": "filter", - "from": "speech_balloon_template", - "filter_key": "speech_balloon_template_id" + "args": { + "from": "speech_balloon_template", + "filter_key": "speech_balloon_template_id" + } }, "by_author": { "type": "element_filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } } }, "speech": { "public_list": {}, "by_speech_balloon": { "type": "filter", - "from": "speech_balloon", - "includes": { - "speech_balloon": { - "panel": {} - } - }, - "filter_key": "speech_balloon_id" + "args": { + "from": "speech_balloon", + "includes": { + "speech_balloon": { + "panel": {} + } + }, + "filter_key": "speech_balloon_id" + } }, "by_writing_format": { "type": "filter", - "from": "writing_format", - "filter_key": "writing_format_id" + "args": { + "from": "writing_format", + "filter_key": "writing_format_id" + } } }, "balloon": { "public_list": {}, "by_speech_balloon": { "type": "filter", - "from": "speech_balloon", - "includes": { - "speech_balloon": { - "panel": {} - } - }, - "filter_key": "speech_balloon_id" + "args": { + "from": "speech_balloon", + "includes": { + "speech_balloon": { + "panel": {} + } + }, + "filter_key": "speech_balloon_id" + } } }, "ground_picture": { @@ -5071,13 +4807,17 @@ }, "by_panel": { "type": "filter", - "from": "panel", - "filter_key": "panel_id" + "args": { + "from": "panel", + "filter_key": "panel_id" + } }, "by_author": { "type": "element_filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } } }, "ground_color": { @@ -5085,13 +4825,17 @@ "private_list": {}, "by_panel": { "type": "filter", - "from": "panel", - "filter_key": "panel_id" + "args": { + "from": "panel", + "filter_key": "panel_id" + } }, "by_author": { "type": "element_filter", - "from": "author", - "filter_key": "author_id" + "args": { + "from": "author", + "filter_key": "author_id" + } } }, "original_picture": { @@ -5103,13 +4847,17 @@ "private_list": {}, "by_license": { "type": "filter", - "from": "license", - "filter_key": "license_id" + "args": { + "from": "license", + "filter_key": "license_id" + } }, "by_artist": { "type": "filter", - "from": "artist", - "filter_key": "artist_id" + "args": { + "from": "artist", + "filter_key": "artist_id" + } } }, "speech_balloon_template": { @@ -5125,8 +4873,10 @@ }, "by_system_picture": { "type": "filter", - "from": "system_picture", - "filter_key": "system_picture_id" + "args": { + "from": "system_picture", + "filter_key": "system_picture_id" + } } }, "license_group": { @@ -5139,13 +4889,17 @@ "public_list": {}, "by_license_group": { "type": "filter", - "from": "license_group", - "filter_key": "license_group_id" + "args": { + "from": "license_group", + "filter_key": "license_group_id" + } }, "by_system_picture": { "type": "filter", - "from": "system_picture", - "filter_key": "system_picture_id" + "args": { + "from": "system_picture", + "filter_key": "system_picture_id" + } } }, "author": { -- 2.11.0