test update

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

diff --git a/config/routes.rb b/config/routes.rb
index 2a20daa..298471f 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,15 @@
 Pettanr::Application.routes.draw do
 
+  devise_for :users , :controllers => { :registrations => "user_registrations" }
   devise_for :admins
-  devise_for :authors, :controllers => { :registrations => "author_registrations" }
 
   match 'original_pictures/:id(.:format)/refresh' => 'original_pictures#refresh'
 
-  resources :artists do
+  resources :authors do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -18,17 +19,21 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
-  resources :speaches do
+  resources :artists do
     collection do
       get :index
       get :show
+      get :count
+      post :create
       get :list
       get :browse
     end
     member do
+      put :update
+      delete :destroy
     end
   end
-  resources :balloons do
+  resources :speach_balloon_templates do
     collection do
       get :index
       get :show
@@ -36,6 +41,7 @@ Pettanr::Application.routes.draw do
       get :browse
     end
     member do
+      delete :destroy
     end
   end
   resources :speach_templates do
@@ -58,17 +64,28 @@ Pettanr::Application.routes.draw do
     member do
     end
   end
+  resources :speaches do
+    collection do
+      get :list
+      get :browse
+    end
+    member do
+    end
+  end
+  resources :balloons do
+    collection do
+      get :list
+      get :browse
+    end
+    member do
+    end
+  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
@@ -85,6 +102,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       get :list
       get :browse
     end
@@ -110,6 +128,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -123,6 +142,7 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -132,7 +152,7 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
-  resources :lisences do
+  resources :licenses do
     collection do
       get :index
       get :show
@@ -140,7 +160,7 @@ Pettanr::Application.routes.draw do
       get :browse
     end
   end
-  resources :original_lisences do
+  resources :original_licenses do
     collection do
       get :index
       get :show
@@ -155,11 +175,11 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
-  resources :common_lisences do
+  resources :common_licenses do
     collection do
       get :index
       get :show
-      post :create
+      post :import
       get :list
       get :browse
     end