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

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

diff --git a/config/routes.rb b/config/routes.rb
index f9c7f47..003ea56 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,38 +1,45 @@
 Pettanr::Application.routes.draw do
 
-  devise_for :users , :controllers => { :registrations => "user_registrations" }
+  devise_for :users
   devise_for :admins
+  devise_for :demand_users
   
   Pettanr::Application.licenses.each do |name, klass|
     mount Module.const_get(klass)::Engine => "/#{name}"
   end
   
   resources :authors do
+    new do
+      get :new
+    end
     collection do
       get :index
       get :show
       get :count
       post :create
       get :list
-      get :browse
     end
     member do
       put :update
       delete :destroy
+      get :browse
     end
   end
   resources :artists do
+    new do
+      get :new
+    end
     collection do
       get :index
       get :show
       get :count
       post :create
       get :list
-      get :browse
     end
     member do
       put :update
       delete :destroy
+      get :browse
     end
   end
   resources :speech_balloon_templates do
@@ -40,34 +47,40 @@ Pettanr::Application.routes.draw do
       get :index
       get :show
       get :list
-      get :browse
     end
     member do
+      get :browse
       delete :destroy
     end
   end
   resources :speeches do
     collection do
+      get :index
+      get :show
       get :list
-      get :browse
     end
     member do
+      get :browse
     end
   end
   resources :balloons do
     collection do
+      get :index
+      get :show
       get :list
-      get :browse
     end
     member do
+      get :browse
     end
   end
   resources :speech_balloons do
     collection do
+      get :index
+      get :show
       get :list
-      get :browse
     end
     member do
+      get :browse
     end
   end
   resources :panel_pictures do
@@ -75,31 +88,36 @@ Pettanr::Application.routes.draw do
       get :index
       get :show
       get :list
-      get :browse
     end
     member do
+      get :browse
     end
   end
   resources :pictures do
     collection do
       get :show
+      get :credit
+      get :search
+      get :list
     end
     member do
       get :credit
+      get :browse
     end
   end
   resources :resource_pictures do
     collection do
       get :index
-      get :new
       get :show
+      get :new
       post :create
       get :count
       get :list
-      get :browse
     end
     member do
+      delete :destroy
       get :credit
+      get :browse
     end
   end
   resources :original_pictures do
@@ -111,22 +129,60 @@ Pettanr::Application.routes.draw do
       get :show
       post :create
       get :list
-      get :browse
     end
     member do
       get :edit
       put :update
       delete :destroy
+      get :history
+      get :browse
     end
   end
   resources :original_picture_license_groups do
     new do
-      get :new
+      post :new
     end
     collection do
       post :create
     end
   end
+  resources :colors do
+    collection do
+      get :index
+      get :show
+      get :list
+    end
+    member do
+      get :browse
+    end
+  end
+  resources :panel_colors do
+    collection do
+      get :index
+      get :show
+    end
+    member do
+      get :browse
+    end
+  end
+  resources :ground_colors do
+    collection do
+      get :index
+      get :show
+    end
+    member do
+      get :browse
+    end
+  end
+  resources :ground_pictures do
+    collection do
+      get :index
+      get :show
+    end
+    member do
+      get :browse
+    end
+  end
   resources :panels do
     new do
       get :new
@@ -137,11 +193,11 @@ Pettanr::Application.routes.draw do
       get :count
       post :create
       get :list
-      get :browse
     end
     member do
       put :update
       delete :destroy
+      get :browse
     end
   end
   resources :stories do
@@ -149,14 +205,16 @@ Pettanr::Application.routes.draw do
       get :new
     end
     collection do
+      get :index
       get :show
       post :create
       get :list
-      get :browse
     end
     member do
+      get :comic
       put :update
       delete :destroy
+      get :browse
     end
   end
   resources :comics do
@@ -169,18 +227,22 @@ Pettanr::Application.routes.draw do
       get :count
       post :create
       get :list
-      get :browse
     end
     member do
+      get :edit
       put :update
       delete :destroy
+      get :browse
     end
   end
   resources :licenses do
     collection do
       get :index
       get :show
+      get :search
       get :list
+    end
+    member do
       get :browse
     end
   end
@@ -189,52 +251,97 @@ Pettanr::Application.routes.draw do
       get :index
       get :show
       get :list
+    end
+    member do
       get :browse
+      delete :destroy
     end
   end
-  resources :original_licenses do
+  resources :system_pictures do
     collection do
       get :index
       get :show
-      get :new
-      post :create
+      get :list
+    end
+    member do
+      get :browse
+      delete :destroy
+    end
+  end
+  resources :provider_sources do
+    collection do
+      get :index
       post :import
       get :list
       get :browse
     end
     member do
+    end
+  end
+  resources :providers do
+    collection do
+      get :index
+      get :show
+      get :list
+      get :browse
+    end
+    member do
+      delete :destroy
+    end
+  end
+  resources :provider_statuses do
+    collection do
+      get :index
+      get :show
+      get :list
+      get :browse
+    end
+    member do
       get :edit
       put :update
       delete :destroy
+      post :licenses_import
+      post :artists_import
+      post :original_pictures_import
+      post :import
     end
   end
-  resources :common_licenses do
+  resources :demanders do
+    new do
+      get :new
+    end
     collection do
       get :index
       get :show
-      post :import
+      post :create
       get :list
       get :browse
+      post :req
+      get :licenses_export
+      get :artists_export
+      get :original_pictures_export
+      get :pictures_export
+      get :export
     end
     member do
+      get :edit
       put :update
       delete :destroy
     end
   end
-  resources :system_pictures do
+  resources :demander_statuses do
     collection do
       get :index
       get :show
-      post :create
       get :list
       get :browse
     end
     member do
+      get :edit
       put :update
       delete :destroy
     end
   end
-
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
@@ -243,8 +350,8 @@ Pettanr::Application.routes.draw do
   # Keep in mind you can assign values other than :controller and :action
   match 'resource_pictures/:subdir/:id(.:format)/' => 'resource_pictures#show'
   match 'pictures/:subdir/:id(.:format)/' => 'pictures#show'
+  match 'stories/comic/:id(.:format)' => 'stories#comic'
   match 'home/(:action)', :controller => 'home'
-  match 'help/(:action)', :controller => 'help'
   match 'system/(:action)', :controller => 'system'
   match 'authors/(:action(/:id))', :controller => 'authors'