merge v04

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

diff --git a/config/routes.rb b/config/routes.rb
index 79088cb..353343b 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,10 +90,12 @@ Pettanr::Application.routes.draw do
     end
   end
   resources :original_pictures do
+    new do
+      get :new
+    end
     collection do
       get :index
       get :show
-      get :new
       post :create
       get :list
       get :browse
@@ -130,7 +132,25 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
+  resources :stories do
+    new do
+      get :new
+    end
+    collection do
+      post :create
+      get :list
+      get :browse
+    end
+    member do
+      get :show
+      put :update
+      delete :destroy
+    end
+  end
   resources :comics do #, except: [:new, :edit]
+    new do
+      get :new
+    end
     collection do
       get :index
       get :show