v2.rb in katello-2.4.0.rc3

- old
+ new

@@ -33,20 +33,21 @@
             match '/product_content' => 'activation_keys#product_content', :via => :get
             match '/content_override' => 'activation_keys#content_override', :via => :put
             post :copy
             put :add_subscriptions
             put :remove_subscriptions
+            get :subscriptions
           end
           match '/releases' => 'activation_keys#available_releases', :via => :get, :on => :member
           api_resources :host_collections, :only => [:index]
           member do
             match '/host_collections' => 'activation_keys#add_host_collections', :via => :post
             match '/host_collections' => 'activation_keys#remove_host_collections', :via => :put
             match '/host_collections/available' => 'activation_keys#available_host_collections', :via => :get
           end
           api_resources :products, :only => [:index]
-          api_resources :subscriptions, :only => [:index] do
+          api_resources :subscriptions, :only => [] do
             collection do
               match '/available' => 'subscriptions#available', :via => :get
             end
           end
           api_resources :systems, :only => [:index]
@@ -57,11 +58,10 @@
           member do
             post :copy
             post :publish
             post :refresh
             put :remove
-            get :history
             get :available_puppet_modules
             get :available_puppet_module_names
             match '/environments/:environment_id' => "content_views#remove_from_environment", :via => :delete
           end
           api_resources :content_view_puppet_modules do
@@ -74,10 +74,15 @@
               get :auto_complete_search
             end
             api_resources :errata, :only => [:index]
             api_resources :package_groups, :only => [:index]
           end
+          api_resources :history, :controller => :content_view_histories, :only => [:index] do
+            collection do
+              get :auto_complete_search
+            end
+          end
           api_resources :puppet_modules, :only => [:index]
           api_resources :repositories, :only => [:index]
           api_resources :content_view_versions, :only => [:index]
         end
 
@@ -233,15 +238,20 @@
             get :pools
             get :releases
             put :refresh_subscriptions
             put :content_override
             get :product_content
+            get :subscriptions, :action => :subscriptions
+            post :subscriptions, :action => :add_subscriptions
           end
+          collection do
+            get :auto_complete_search
+          end
           api_resources :activation_keys, :only => [:index]
           api_resources :host_collections, :only => [:index]
           api_resources :products, :only => [:index]
-          api_resources :subscriptions, :only => [:create, :index, :destroy] do
+          api_resources :subscriptions, :only => [:destroy] do
             collection do
               match '/' => 'subscriptions#destroy', :via => :put
               match '/available' => 'subscriptions#available', :via => :get
               match '/serials/:serial_id' => 'subscriptions#destroy_by_serial', :via => :delete
             end
@@ -301,9 +311,10 @@
             match '/bulk/update_content' => 'systems_bulk_actions#update_content', :via => :put
             match '/bulk/remove_content' => 'systems_bulk_actions#remove_content', :via => :put
             match '/bulk/destroy' => 'systems_bulk_actions#destroy_systems', :via => :put
             match '/bulk/environment_content_view' => 'systems_bulk_actions#environment_content_view', :via => :put
             match '/bulk/available_incremental_updates' => 'systems_bulk_actions#available_incremental_updates', :via => :post
+            get :auto_complete_search
           end
           resource :packages, :only => [], :controller => :system_packages do
             collection do
               put :remove
               put :install