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

Upgrade to rails 4.2

Browse source
This commit is contained in:
wvengen 2015-01-02 17:40:21 +01:00
parent 8777830029
commit 7bc9d0ede6
5 changed files with 114 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/environments/production.rb
View file

@ -20,7 +20,7 @@ Foodsoft::Application.configure do
# config.action_dispatch.rack_cache = true
# Disable Rails's static asset server (Apache or nginx will already do this).
config.serve_static_assets = false
config.serve_static_files = false
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier

2
config/environments/test.rb
View file

@ -19,7 +19,7 @@ Foodsoft::Application.configure do
config.assets.initialize_on_precompile = true
# Configure static asset server for tests with Cache-Control for performance.
config.serve_static_assets = true
config.serve_static_files = true
config.static_cache_control = "public, max-age=3600"
# Show full error reports and disable caching.

62
config/routes.rb
View file

@ -6,32 +6,32 @@ Foodsoft::Application.routes.draw do
get "sessions/new"
root :to => 'sessions#redirect_to_foodcoop', as: nil
root to: 'sessions#redirect_to_foodcoop', as: nil
scope '/:foodcoop' do
# Root path
root :to => 'home#index'
root to: 'home#index'
########### Sessions
get '/login' => 'sessions#new', :as => 'login'
get '/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
patch '/login/update_password' => 'login#update_password', as: :update_password
match '/login/accept_invitation/:token' => 'login#accept_invitation', as: :accept_invitation, via: [:get, :post]
resources :sessions, :only => [:new, :create, :destroy]
resources :sessions, only: [:new, :create, :destroy]
get '/foodcoop.css' => 'styles#foodcoop', :as => 'foodcoop_css'
get '/foodcoop.css' => 'styles#foodcoop', as: 'foodcoop_css'
########### User specific
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'
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
@ -51,16 +51,16 @@ Foodsoft::Application.routes.draw do
end
resources :group_orders do
get :archive, :on => :collection
get :archive, on: :collection
end
resources :group_order_articles
resources :order_comments, :only => [:new, :create]
resources :order_comments, only: [:new, :create]
############ Foodcoop orga
resources :invites, :only => [:new, :create]
resources :invites, only: [:new, :create]
resources :tasks do
collection do
@ -76,13 +76,13 @@ Foodsoft::Application.routes.draw do
end
namespace :foodcoop do
root :to => 'users#index'
root to: 'users#index'
resources :users, :only => [:index]
resources :users, only: [:index]
resources :ordergroups, :only => [:index]
resources :ordergroups, only: [:index]
resources :workgroups, :only => [:index, :edit, :update]
resources :workgroups, only: [:index, :edit, :update]
end
########### Article management
@ -94,7 +94,7 @@ Foodsoft::Application.routes.draw do
end
end
resources :stock_articles, :to => 'stockit' do
resources :stock_articles, controller: 'stockit' do
get :copy
collection do
get :derive
@ -107,7 +107,7 @@ Foodsoft::Application.routes.draw do
end
resources :suppliers do
get :shared_suppliers, :on => :collection
get :shared_suppliers, on: :collection
resources :deliveries do
collection do
@ -139,7 +139,7 @@ Foodsoft::Application.routes.draw do
########### Finance
namespace :finance do
root :to => 'base#index'
root to: 'base#index'
resources :order, controller: 'balancing', path: 'balancing' do
member do
@ -158,44 +158,44 @@ Foodsoft::Application.routes.draw do
resources :invoices
resources :ordergroups, :only => [:index] do
resources :financial_transactions, :as => :transactions
resources :ordergroups, only: [:index] do
resources :financial_transactions, as: :transactions
end
get 'transactions' => 'financial_transactions#index_collection'
get 'transactions/new_collection' => 'financial_transactions#new_collection', :as => 'new_transaction_collection'
post 'transactions/create_collection' => 'financial_transactions#create_collection', :as => 'create_transaction_collection'
get 'transactions/new_collection' => 'financial_transactions#new_collection', as: 'new_transaction_collection'
post 'transactions/create_collection' => 'financial_transactions#create_collection', as: 'create_transaction_collection'
end
########### Administration
namespace :admin do
root :to => 'base#index'
root to: 'base#index'
resources :users do
post :sudo, :on => :member
post :sudo, on: :member
end
resources :workgroups do
get :memberships, :on => :member
get :memberships, on: :member
end
resources :ordergroups do
get :memberships, :on => :member
get :memberships, on: :member
end
resource :config, :only => [:show, :update] do
resource :config, only: [:show, :update] do
get :list
end
end
############## Feedback
resource :feedback, :only => [:new, :create], :controller => 'feedback'
resource :feedback, only: [:new, :create], controller: 'feedback'
############## The rest
resources :users, :only => [:index]
resources :users, only: [:index]
end # End of /:foodcoop scope
end