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 b72ecdf..555e8dd 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -220,6 +220,9 @@
         "show": {\r
           "type": "show"\r
         },\r
+        "watch": {\r
+          "type": "show"\r
+        },\r
         "count": {\r
           "type": "count",\r
           "args": {\r
@@ -231,6 +234,9 @@
         },\r
         "edit": {\r
           "type": "edit"\r
+        },\r
+        "destroy": {\r
+          "type": "destroy"\r
         }\r
       }\r
     },\r
@@ -406,9 +412,6 @@
         "by_story": {\r
           "type": "list"\r
         },\r
-        "by_author": {\r
-          "type": "list"\r
-        },\r
         "show": {\r
           "type": "show"\r
         },\r
@@ -424,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
@@ -957,7 +957,7 @@
         "count": {\r
           "type": "count",\r
           "args": {\r
-            "list_name": "public"\r
+            "list_name": "private"\r
           }\r
         },\r
         "new": {\r
@@ -1539,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
@@ -1624,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
@@ -1715,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
@@ -1899,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
@@ -3002,7 +2983,7 @@
             "required": true\r
           }\r
         },\r
-        "author_id": {\r
+        "user_id": {\r
           "type": "number",\r
           "rules": {\r
             "required": true,\r
@@ -3838,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
@@ -3918,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