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

[pettanr/pettanr.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 6299c42..36da091 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,12 +40,8 @@ Pettanr::Application.routes.draw do
       post :create
     end
     member do
-      get :scroll_panels
-      get :panels
       get :by_author
       get :by_panel
-      get :scroll_panels_count
-      get :panels_count
       get :count_by_author
       get :count_by_panel
       get :play
@@ -62,6 +58,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
     end
     member do
@@ -87,18 +84,38 @@ Pettanr::Application.routes.draw do
       post :create
     end
     member do
-      get :stories
       get :by_author
-      get :by_me
-      get :stories_count
+      get :by_story
       get :count_by_author
-      get :count_by_me
+      get :count_by_story
       get :play
       get :edit
       put :update
       delete :destroy
     end
   end
+  resources :comic_stories do
+    new do
+      get :new
+    end
+    collection do
+      get :index
+      get :show
+      get :count
+      post :create
+    end
+    member do
+      get :by_comic
+      get :by_story
+      get :by_author
+      get :count_by_comic
+      get :count_by_story
+      get :count_by_author
+      get :edit
+      put :update
+      delete :destroy
+    end
+  end
   resources :stories do
     new do
       get :new
@@ -106,16 +123,13 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
     end
     member do
-      get :story_sheets
-      get :sheets
       get :by_comic
       get :by_sheet
       get :by_author
-      get :story_sheets_count
-      get :sheets_count
       get :count_by_comic
       get :count_by_sheet
       get :count_by_author
@@ -132,6 +146,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
     end
     member do
@@ -164,10 +179,6 @@ Pettanr::Application.routes.draw do
       get :by_story
       get :by_panel
       get :by_author
-      get :story_sheets_count
-      get :stories_count
-      get :sheet_panels_count
-      get :panels_count
       get :count_by_story
       get :count_by_panel
       get :count_by_author
@@ -184,6 +195,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
     end
     member do
@@ -209,28 +221,14 @@ Pettanr::Application.routes.draw do
       post :create
     end
     member do
-      get :scroll_panels
-      get :scrolls
-      get :sheet_panels
-      get :sheets
-      get :panel_pictures
-      get :speech_balloons
-      get :ground_pictures
-      get :ground_colors
       get :by_scroll
       get :by_sheet
       get :by_author
-      get :scroll_panels_count
-      get :scrolls_count
-      get :sheet_panels_count
-      get :sheets_count
-      get :panel_pictures_count
-      get :speech_balloons_count
-      get :ground_pictures_count
-      get :ground_colors_count
+      get :by_speech_balloon_template
       get :count_by_scroll
       get :count_by_sheet
       get :count_by_author
+      get :count_by_speech_balloon_template
       get :catch
       get :edit
       put :update
@@ -244,6 +242,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
     end
     member do
@@ -263,14 +262,16 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
     end
     member do
       get :by_panel
       get :by_author
-      #get :by_speech_balloon_template
+      get :by_speech_balloon_template
       get :count_by_panel
       get :count_by_author
+      get :count_by_speech_balloon_template
       get :edit
       put :update
       delete :destroy
@@ -280,11 +281,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
     end
     member do
-      get :by_speech_balloon
-      #get :by_system_picture
-      get :count_by_speech_balloon
+      get :by_author
+      get :count_by_author
       get :edit
       put :update
     end
@@ -293,12 +294,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
     end
     member do
-      get :by_speech_balloon
-      get :by_writing_format
-      get :count_by_speech_balloon
-      get :count_by_writing_format
+      get :by_author
+      get :count_by_author
       get :edit
       put :update
     end
@@ -310,6 +310,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
     end
     member do
       get :by_panel
@@ -328,6 +329,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
     end
     member do
       get :by_panel
@@ -346,6 +348,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
     end
     member do
@@ -359,29 +362,29 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       get :credit
       get :search
-      get :list
     end
     member do
+      get :by_artist
+      get :count_by_artist
       get :credit
-      get :browse
     end
   end
   resources :resource_pictures do
     collection do
       get :index
       get :show
+      get :count
       get :new
       post :create
       get :count
     end
     member do
       get :by_license
-        get :by_license_group
       get :by_artist
       get :count_by_license
-        get :count_by_license_group
       get :count_by_artist
       delete :destroy
       get :credit
@@ -391,14 +394,15 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
+      post :create
     end
     member do
-      get :speech_balloons
-      get :panels
+      get :by_panel
       get :by_system_picture
-      get :speech_balloons_count
-      get :panels_count
       get :count_by_system_picture
+      get :count_by_panel
+      put :update
       delete :destroy
     end
   end
@@ -406,22 +410,29 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
+      post :create
     end
     member do
       get :speeches
       get :by_system_picture
       get :speeches_count
       get :count_by_system_picture
+      put :update
+      delete :destroy
     end
   end
   resources :license_groups do
     collection do
       get :index
       get :show
+      get :count
+      post :create
     end
     member do
       get :licenses
       get :licenses_count
+      put :update
       delete :destroy
     end
   end
@@ -431,6 +442,7 @@ Pettanr::Application.routes.draw do
       get :show
       get :count
       get :search
+      post :create
     end
     member do
       get :resource_pictures
@@ -439,6 +451,8 @@ Pettanr::Application.routes.draw do
       get :resource_pictures_count
       get :count_by_license_group
       get :count_by_system_picture
+      put :update
+      delete :destroy
     end
   end
   resources :authors do
@@ -452,30 +466,6 @@ Pettanr::Application.routes.draw do
       post :create
     end
     member do
-      get :scrolls
-      get :scroll_panels
-      get :comics
-      get :stories
-      get :story_sheets
-      get :sheets
-      get :sheet_panels
-      get :panels
-      get :panel_pictures
-      get :speech_balloons
-      get :ground_pictures
-      get :ground_colors
-      get :scrolls_count
-      get :scroll_panels_count
-      get :comics_count
-      get :stories_count
-      get :story_sheets_count
-      get :sheets_count
-      get :sheet_panels_count
-      get :panels_count
-      get :panel_pictures_count
-      get :speech_balloons_count
-      get :ground_pictures_count
-      get :ground_colors_count
       get :edit
       put :update
       delete :destroy
@@ -492,8 +482,6 @@ Pettanr::Application.routes.draw do
       post :create
     end
     member do
-      get :resource_pictures
-      get :resource_pictures_count
       get :edit
       put :update
       delete :destroy
@@ -503,6 +491,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
     end
     member do
       #get :balloons