Merge branch 'sort_softkeys' into develop

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'