Release a new beta.5.1-beta4

1 files changed, 30 insertions, 86 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 9d47efc..6d7a2ad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,20 +1,21 @@
 Gemeinschaft42c::Application.routes.draw do
 
+  resources :intruders
+
+  resources :backup_jobs, :except => [:edit, :update]
+
   scope :constraints => lambda{|req|%w(127.0.0.1).include? req.remote_addr} do
     get "trigger/voicemail"
     get "trigger/fax"
   end
 
   resources :call_routes do
+    collection { 
+      post :sort 
+      get :show_variables
+    }
     resources :route_elements do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
-    member do
-      put 'move_higher'
-      put 'move_lower'
+      collection { post :sort }
     end
   end
 
@@ -41,95 +42,54 @@ Gemeinschaft42c::Application.routes.draw do
     resources :rows 
   end
 
+  resources :phone_numbers, :only => [:sort] do
+    collection { post :sort }
+  end
+
   resources :acd_agents, :only => [] do
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
 
   resources :automatic_call_distributors, :only => [] do
     resources :acd_agents
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
 
   resources :hunt_group_members, :only => [] do
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
 
   resources :hunt_groups, :only => [] do
     resources :hunt_group_members
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
 
   if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
     resources :whitelists, :only => [] do
-      resources :phone_numbers do
-        member do
-          put 'move_higher'
-          put 'move_lower'
-        end
-      end
+      resources :phone_numbers
     end
   end
 
   resources :access_authorizations, :only => [] do
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
 
   resources :fax_documents
 
   resources :fax_accounts, :only => [] do
     resources :fax_documents
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
 
   resources :gemeinschaft_setups, :only => [:new, :create]
-  
+
   resources :phone_number_ranges, :only => [] do
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
   
   resources :conferences, :only => [] do
     resources :conference_invitees
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
   end
   
   resources :phone_numbers, :only => [] do
@@ -228,9 +188,6 @@ Gemeinschaft42c::Application.routes.draw do
   
   root :to => "page#index"
   
-  get  "wizards/new_initial_setup"
-  post "wizards/create_initial_setup"
-  
   resources :users do
     # Display all phone books that the current user owns:
     resources :phone_books
@@ -271,31 +228,20 @@ Gemeinschaft42c::Application.routes.draw do
 
   resources :callthroughs, :only => [] do
     resources :access_authorizations
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
     if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
       resources :whitelists
     end
   end
 
+  resources :softkeys, :only => [ :sort ] do
+    collection { post :sort }
+  end
+
   resources :sip_accounts, :only => [] do
     resources :phones_sip_accounts
-    resources :phone_numbers do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
-    resources :softkeys do
-      member do
-        put 'move_higher'
-        put 'move_lower'
-      end
-    end
+    resources :phone_numbers
+    resources :softkeys
     resources :call_histories do
       collection do
         delete 'destroy_multiple'
@@ -325,8 +271,6 @@ Gemeinschaft42c::Application.routes.draw do
   resources :phone_book_entries, :only => [ :index, :show ] do
     resources :phone_numbers do
       member do
-        put 'move_higher'
-        put 'move_lower'
         put 'call'
       end
     end