Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / public / manifest.json

diff --git a/public/manifest.json b/public/manifest.json
index 153be94..555e8dd 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -83,7 +83,11 @@
       "args": {\r
         "parent_model_name": "speech_balloon",\r
         "boost": {\r
-          "writing_format": {},\r
+          "writing_format": {\r
+            "level": "read",\r
+            "item_name_for_extend_model": "renderer",\r
+            "extend_module_name": "RendererModule"\r
+          },\r
           "speech_balloon_template": {\r
             "extend_model_class_name": "Speech",\r
             "item_name_for_extend_model": "speech"\r
@@ -152,6 +156,18 @@
         }\r
       }\r
     },\r
+    "original_picture_license_group": {},\r
+    "original_picture_license": {\r
+      "args": {\r
+        "boost": {\r
+          "license": {\r
+            "template_name": "license_group",\r
+            "extend_model_class_name": "Attribute",\r
+            "item_name_for_extend_model": "attribute"\r
+          }\r
+        }\r
+      }\r
+    },\r
     "speech_balloon_template": {\r
       "type": "template"\r
     },\r
@@ -204,6 +220,9 @@
         "show": {\r
           "type": "show"\r
         },\r
+        "watch": {\r
+          "type": "show"\r
+        },\r
         "count": {\r
           "type": "count",\r
           "args": {\r
@@ -215,6 +234,9 @@
         },\r
         "edit": {\r
           "type": "edit"\r
+        },\r
+        "destroy": {\r
+          "type": "destroy"\r
         }\r
       }\r
     },\r
@@ -390,9 +412,6 @@
         "by_story": {\r
           "type": "list"\r
         },\r
-        "by_author": {\r
-          "type": "list"\r
-        },\r
         "show": {\r
           "type": "show"\r
         },\r
@@ -408,9 +427,6 @@
         "count_by_story": {\r
           "type": "count"\r
         },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -941,7 +957,7 @@
         "count": {\r
           "type": "count",\r
           "args": {\r
-            "list_name": "public"\r
+            "list_name": "private"\r
           }\r
         },\r
         "new": {\r
@@ -994,6 +1010,9 @@
             "list_name": "public"\r
           }\r
         },\r
+        "by_license_group": {\r
+          "type": "list"\r
+        },\r
         "by_license": {\r
           "type": "list"\r
         },\r
@@ -1009,6 +1028,9 @@
             "list_name": "public"\r
           }\r
         },\r
+        "count_by_license_group": {\r
+          "type": "count"\r
+        },\r
         "count_by_license": {\r
           "type": "count"\r
         },\r
@@ -1517,13 +1539,6 @@
             "number": true,\r
             "min": 0\r
           }\r
-        },\r
-        "author_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
         }\r
       }\r
     },\r
@@ -1602,19 +1617,14 @@
             "number": true,\r
             "min": 0\r
           }\r
-        },\r
-        "author_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
         }\r
       }\r
     },\r
     "story": {\r
       "associations": {\r
-        "belongs_to": {},\r
+        "belongs_to": {\r
+          "author": {}\r
+        },\r
         "has_many": {\r
           "comic_stories": {},\r
           "comics": {\r
@@ -1693,13 +1703,6 @@
             "number": true,\r
             "min": 0\r
           }\r
-        },\r
-        "author_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
         }\r
       }\r
     },\r
@@ -1877,7 +1880,7 @@
           "source": {\r
             "type": "magic_number",\r
             "args": {\r
-              "select_item_name": "panel_visible_items"\r
+              "select_item_name": "panel_publish_items"\r
             }\r
           }\r
         },\r
@@ -2457,7 +2460,8 @@
       "associations": {\r
         "belongs_to": {\r
           "license": {},\r
-          "artist": {}\r
+          "artist": {},\r
+          "system_picture": {}\r
         },\r
         "has_many": {},\r
         "has_one": {}\r
@@ -2524,10 +2528,11 @@
             "required": true\r
           }\r
         },\r
-        "artist_name": {\r
-          "type": "text",\r
+        "system_picture_id": {\r
+          "type": "number",\r
           "rules": {\r
-            "required": true\r
+            "required": true,\r
+            "number": true\r
           }\r
         },\r
         "license_group_settings": {\r
@@ -2554,8 +2559,10 @@
       "associations": {\r
         "belongs_to": {\r
           "original_picture": {},\r
+          "license_group": {},\r
           "license": {},\r
-          "artist": {}\r
+          "artist": {},\r
+          "system_picture": {}\r
         },\r
         "has_many": {},\r
         "has_one": {}\r
@@ -2602,6 +2609,13 @@
             "number": true\r
           }\r
         },\r
+        "license_group_id": {\r
+          "type": "number",\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          }\r
+        },\r
         "license_id": {\r
           "type": "number",\r
           "rules": {\r
@@ -2615,10 +2629,11 @@
             "required": true\r
           }\r
         },\r
-        "artist_name": {\r
-          "type": "text",\r
+        "system_picture_id": {\r
+          "type": "number",\r
           "rules": {\r
-            "required": true\r
+            "required": true,\r
+            "number": true\r
           }\r
         },\r
         "license_group_settings": {\r
@@ -2648,6 +2663,89 @@
         }\r
       }\r
     },\r
+    "original_picture_license_group": {\r
+      "associations": {\r
+        "belongs_to": {\r
+          "original_picture": {},\r
+          "license_group": {}\r
+        },\r
+        "has_many": {},\r
+        "has_one": {}\r
+      },\r
+      "attributes": {\r
+        "original_picture_id": {\r
+          "type": "number",\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          }\r
+        },\r
+        "license_group_id": {\r
+          "type": "number",\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          },\r
+          "source": {\r
+            "type": "model"\r
+          }\r
+        }\r
+      }\r
+    },\r
+    "original_picture_license": {\r
+      "associations": {\r
+        "belongs_to": {\r
+          "original_picture": {},\r
+          "license": {},\r
+          "system_picture": {}\r
+        },\r
+        "has_many": {},\r
+        "has_one": {}\r
+      },\r
+      "attributes": {\r
+        "original_picture_id": {\r
+          "type": "number",\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          }\r
+        },\r
+        "license_group_id": {\r
+          "type": "number",\r
+          "source": {\r
+            "type": "model"\r
+          },\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          }\r
+        },\r
+        "license_id": {\r
+          "type": "number",\r
+          "source": {\r
+            "type": "filter",\r
+            "args": {\r
+              "resource_list_name": "by_license_group",\r
+              "filter_column_name": "license_group_id"\r
+            }\r
+          },\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          }\r
+        },\r
+        "license_settings": {\r
+          "type": "text",\r
+          "rules": {}\r
+        },\r
+        "license_group_module_name": {\r
+          "type": "text",\r
+          "rules": {\r
+            "required": true\r
+          }\r
+        }\r
+      }\r
+    },\r
     "speech_balloon_template": {\r
       "associations": {\r
         "belongs_to": {\r
@@ -2751,6 +2849,7 @@
       "associations": {\r
         "belongs_to": {},\r
         "has_many": {\r
+          "resource_pictures": {},\r
           "licenses": {}\r
         },\r
         "has_one": {}\r
@@ -2884,7 +2983,7 @@
             "required": true\r
           }\r
         },\r
-        "author_id": {\r
+        "user_id": {\r
           "type": "number",\r
           "rules": {\r
             "required": true,\r
@@ -2941,8 +3040,57 @@
       }\r
     },\r
     "circle_speech_balloon_speech_balloon": {\r
+      "attributes": {}\r
+    },\r
+    "circle_speech_balloon_balloon": {\r
+      "attributes": {}\r
+    },\r
+    "circle_speech_balloon_speech": {\r
+      "attributes": {}\r
+    },\r
+    "plain_speech_balloon_speech_balloon": {\r
+      "attributes": {}\r
+    },\r
+    "plain_speech_balloon_balloon": {\r
+      "attributes": {}\r
+    },\r
+    "plain_speech_balloon_speech": {\r
+      "attributes": {}\r
+    },\r
+    "square_speech_balloon_speech_balloon": {\r
+      "attributes": {}\r
+    },\r
+    "square_speech_balloon_balloon": {\r
+      "attributes": {}\r
+    },\r
+    "square_speech_balloon_speech": {\r
+      "attributes": {}\r
+    },\r
+    "test_speech_balloon_speech_balloon": {\r
       "attributes": {\r
-        "width": {\r
+        "a": {\r
+          "type": "number",\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          }\r
+        }\r
+      }\r
+    },\r
+    "test_speech_balloon_balloon": {\r
+      "attributes": {\r
+        "b": {\r
+          "type": "number",\r
+          "rules": {\r
+            "required": true,\r
+            "number": true\r
+          }\r
+        }\r
+      }\r
+    },\r
+    "test_speech_balloon_speech": {\r
+      "attributes": {\r
+        "c": {\r
           "type": "number",\r
           "rules": {\r
             "required": true,\r
@@ -3045,13 +3193,6 @@
     },\r
     "pettanr_creative_commons_v30_licenses_attribute": {\r
       "attributes": {\r
-        "license_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
-        },\r
         "artist_name": {\r
           "type": "text",\r
           "rules": {\r
@@ -3170,13 +3311,6 @@
     },\r
     "pettanr_pettan_commons_v01_licenses_attribute": {\r
       "attributes": {\r
-        "license_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
-        },\r
         "artist_name": {\r
           "type": "text",\r
           "rules": {\r
@@ -3298,13 +3432,6 @@
     },\r
     "pettanr_pettan_protected_v01_licenses_attribute": {\r
       "attributes": {\r
-        "license_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
-        },\r
         "artist_name": {\r
           "type": "text",\r
           "rules": {\r
@@ -3419,13 +3546,6 @@
     },\r
     "pettanr_pettan_public_v01_licenses_attribute": {\r
       "attributes": {\r
-        "license_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
-        },\r
         "artist_name": {\r
           "type": "text",\r
           "rules": {\r
@@ -3547,13 +3667,6 @@
     },\r
     "pettanr_public_domain_v01_licenses_attribute": {\r
       "attributes": {\r
-        "license_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
-        },\r
         "artist_name": {\r
           "type": "text",\r
           "rules": {\r
@@ -3675,20 +3788,6 @@
     },\r
     "pettanr_unknown_v01_licenses_attribute": {\r
       "attributes": {\r
-        "license_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
-        },\r
-        "system_picture_id": {\r
-          "type": "number",\r
-          "rules": {\r
-            "required": true,\r
-            "number": true\r
-          }\r
-        },\r
         "source_url": {\r
           "type": "text",\r
           "rules": {\r
@@ -3720,8 +3819,7 @@
         "template_items": {\r
           "CircleSpeechBalloon": "circle_speech_balloon",\r
           "PlainSpeechBalloon": "plain_speech_balloon",\r
-          "SquareSpeechBalloon": "square_speech_balloon",\r
-          "TestSpeechBalloon": "test_speech_balloon"\r
+          "SquareSpeechBalloon": "square_speech_balloon"\r
         }\r
       },\r
       "writing_format": {\r
@@ -3800,13 +3898,13 @@
           1\r
         ]\r
       ],\r
-      "panel_visible_items": [\r
+      "panel_publish_items": [\r
         [\r
-          "select_items.panel.visible.private",\r
+          "select_items.panel.publish.private",\r
           0\r
         ],\r
         [\r
-          "select_items.panel.visible.public",\r
+          "select_items.panel.publish.public",\r
           1\r
         ]\r
       ],\r