test update

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

diff --git a/config/routes.rb b/config/routes.rb
index a06d818..298471f 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 Pettanr::Application.routes.draw do
 
-  devise_for :users, :controllers => { :registrations => "user_registrations" }
+  devise_for :users , :controllers => { :registrations => "user_registrations" }
   devise_for :admins
 
   match 'original_pictures/:id(.:format)/refresh' => 'original_pictures#refresh'
@@ -9,6 +9,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -22,6 +23,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -31,7 +33,7 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
-  resources :speaches do
+  resources :speach_balloon_templates do
     collection do
       get :index
       get :show
@@ -39,9 +41,10 @@ Pettanr::Application.routes.draw do
       get :browse
     end
     member do
+      delete :destroy
     end
   end
-  resources :balloons do
+  resources :speach_templates do
     collection do
       get :index
       get :show
@@ -51,7 +54,7 @@ Pettanr::Application.routes.draw do
     member do
     end
   end
-  resources :speach_templates do
+  resources :balloon_templates do
     collection do
       get :index
       get :show
@@ -61,10 +64,16 @@ Pettanr::Application.routes.draw do
     member do
     end
   end
-  resources :balloon_templates do
+  resources :speaches do
+    collection do
+      get :list
+      get :browse
+    end
+    member do
+    end
+  end
+  resources :balloons do
     collection do
-      get :index
-      get :show
       get :list
       get :browse
     end
@@ -73,15 +82,10 @@ Pettanr::Application.routes.draw do
   end
   resources :speach_balloons do
     collection do
-      get :index
-      get :show
-      post :create
       get :list
       get :browse
     end
     member do
-      put :update
-      delete :destroy
     end
   end
   resources :panel_pictures do
@@ -98,6 +102,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       get :list
       get :browse
     end
@@ -123,6 +128,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -136,6 +142,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -172,7 +179,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      post :create
+      post :import
       get :list
       get :browse
     end