summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-04 13:00:45 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-04 13:01:57 +0100
commit66a53a49705c269d73f9d51bb0d4a51283049c71 (patch)
tree39a04e944e45fe5dca90853b47a60ff776c092b4 /config
parent4594ac1559c6ecd534834b41b31d61c281d3401d (diff)
Changed softkey table to be sortable. #150
Diffstat (limited to 'config')
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/routes.rb11
2 files changed, 6 insertions, 7 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e677834..1a3acae 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -13,7 +13,7 @@ Gemeinschaft42c::Application.configure do
config.consider_all_requests_local = true
# Enable caching for development
- config.action_controller.perform_caching = false
+ config.action_controller.perform_caching = true
CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new
# Don't care if the mailer can't send
diff --git a/config/routes.rb b/config/routes.rb
index 9a3b3a3..1ad621e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -271,6 +271,10 @@ Gemeinschaft42c::Application.routes.draw do
end
end
+ resources :softkeys, :only => [ :sort ] do
+ collection { post :sort }
+ end
+
resources :sip_accounts, :only => [] do
resources :phones_sip_accounts
resources :phone_numbers do
@@ -279,12 +283,7 @@ Gemeinschaft42c::Application.routes.draw do
put 'move_lower'
end
end
- resources :softkeys do
- member do
- put 'move_higher'
- put 'move_lower'
- end
- end
+ resources :softkeys
resources :call_histories do
collection do
delete 'destroy_multiple'