Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

migrate to Rails 4.0 (closes foodcoops#214)

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
wvengen 2014-02-20 15:04:53 +01:00
parent 12d1221bfc
commit 7841245795
97 changed files with 659 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

21
config/routes.rb
View file

@ -6,8 +6,7 @@ Foodsoft::Application.routes.draw do
get "sessions/new"
root :to => 'sessions#redirect_to_foodcoop'
root :to => 'sessions#redirect_to_foodcoop', as: nil
scope '/:foodcoop' do
@ -16,21 +15,21 @@ Foodsoft::Application.routes.draw do
########### Sessions
match '/login' => 'sessions#new', :as => 'login'
match '/logout' => 'sessions#destroy', :as => 'logout'
get '/login' => 'sessions#new', :as => 'login'
get '/logout' => 'sessions#destroy', :as => 'logout'
get '/login/forgot_password' => 'login#forgot_password', as: :forgot_password
post '/login/reset_password' => 'login#reset_password', as: :reset_password
get '/login/new_password' => 'login#new_password', as: :new_password
put '/login/update_password' => 'login#update_password', as: :update_password
match '/login/accept_invitation/:token' => 'login#accept_invitation', as: :accept_invitation
match '/login/accept_invitation/:token' => 'login#accept_invitation', as: :accept_invitation, via: [:get, :post]
resources :sessions, :only => [:new, :create, :destroy]
########### User specific
match '/home/profile' => 'home#profile', :as => 'my_profile'
put '/home/update_profile' => 'home#update_profile', :as => 'update_profile'
match '/home/ordergroup' => 'home#ordergroup', :as => 'my_ordergroup'
match '/home/cancel_membership' => 'home#cancel_membership', :as => 'cancel_membership'
get '/home/profile', :as => 'my_profile'
patch '/home/update_profile', :as => 'update_profile'
get '/home/ordergroup' => 'home#ordergroup', :as => 'my_ordergroup'
post '/home/cancel_membership' => 'home#cancel_membership', :as => 'cancel_membership'
############ Orders, ordering
@ -149,8 +148,8 @@ Foodsoft::Application.routes.draw do
put :update_note
get :confirm
put :close
put :close_direct
patch :close
patch :close_direct
get :new_on_order_article_create
get :new_on_order_article_update