change: picker

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

diff --git a/config/routes.rb b/config/routes.rb
index 4391547..bbc107c 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 Pettanr::Application.routes.draw do
 
-  devise_for :users
+  devise_for :users, controllers: {sessions: 'user_sessions'}
   devise_for :admins
   devise_for :demand_users
   
@@ -21,7 +21,6 @@ Pettanr::Application.routes.draw do
       get :index
       get :watch
       get :show
-      get :count
       post :create
     end
     member do
@@ -37,19 +36,15 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_author
       get :by_panel
-      get :count_by_author
-      get :count_by_panel
       get :play
       get :edit
       put :update
       delete :destroy
-      get :browse
     end
   end
   resources :scroll_panels do
@@ -59,16 +54,13 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_panel
       get :by_scroll
       get :by_author
-      get :count_by_panel
-      get :count_by_scroll
-      get :count_by_author
+      get :play
       get :edit
       put :update
       delete :destroy
@@ -81,14 +73,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_author
       get :by_story
-      get :count_by_author
-      get :count_by_story
       get :play
       get :edit
       put :update
@@ -102,16 +91,12 @@ Pettanr::Application.routes.draw do
     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
@@ -124,16 +109,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_comic
       get :by_sheet
       get :by_author
-      get :count_by_comic
-      get :count_by_sheet
-      get :count_by_author
       get :play
       get :edit
       put :update
@@ -147,16 +128,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_story
       get :by_sheet
       get :by_author
-      get :count_by_story
-      get :count_by_sheet
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -169,7 +146,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -180,9 +156,6 @@ Pettanr::Application.routes.draw do
       get :by_story
       get :by_panel
       get :by_author
-      get :count_by_story
-      get :count_by_panel
-      get :count_by_author
       get :play
       get :edit
       put :update
@@ -196,16 +169,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_sheet
       get :by_panel
       get :by_author
-      get :count_by_sheet
-      get :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -218,7 +187,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -226,10 +194,6 @@ Pettanr::Application.routes.draw do
       get :by_sheet
       get :by_author
       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
@@ -243,14 +207,11 @@ 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 :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -263,16 +224,12 @@ 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 :count_by_panel
-      get :count_by_author
-      get :count_by_speech_balloon_template
       get :edit
       put :update
       delete :destroy
@@ -282,11 +239,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_author
-      get :count_by_author
+      get :by_speech_balloon
+      get :by_speech_balloon_template
+      get :by_system_picture
       get :edit
       put :update
     end
@@ -295,11 +253,13 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_author
-      get :count_by_author
+      get :by_speech_balloon
+      get :by_author
+      get :by_speech_balloon_template
+      get :by_writing_format
       get :edit
       put :update
     end
@@ -311,13 +271,10 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_panel
       get :by_author
-      get :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -330,13 +287,10 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_panel
       get :by_author
-      get :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -349,7 +303,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -363,13 +316,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       get :credit
       get :search
     end
     member do
       get :by_artist
-      get :count_by_artist
       get :credit
     end
   end
@@ -377,18 +328,14 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       get :new
       post :create
-      get :count
     end
     member do
+      get :by_original_picture
       get :by_license_group
       get :by_license
       get :by_artist
-      get :count_by_license_group
-      get :count_by_license
-      get :count_by_artist
       delete :destroy
       get :credit
     end
@@ -397,14 +344,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_panel
       get :by_system_picture
-      get :count_by_system_picture
-      get :count_by_panel
       put :update
       delete :destroy
     end
@@ -413,14 +357,12 @@ 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
@@ -429,14 +371,10 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
-      get :resource_pictures
-      get :resource_pictures_count
-      get :licenses
-      get :licenses_count
+      get :by_resource_picture
       put :update
       delete :destroy
     end
@@ -445,7 +383,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       get :search
       post :create
     end
@@ -454,8 +391,6 @@ Pettanr::Application.routes.draw do
       get :by_license_group
       get :by_system_picture
       get :resource_pictures_count
-      get :count_by_license_group
-      get :count_by_system_picture
       put :update
       delete :destroy
     end
@@ -467,7 +402,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -483,7 +417,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -496,14 +429,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       #get :balloons
       get :speech_balloon_templates
       get :licenses
-      get :speech_balloon_templates_count
-      get :licenses_count
       delete :destroy
     end
   end