katello 3.5.0.rc1 → 3.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197daf28e10fa953b9af390cfb2032282e21cc3c
-  data.tar.gz: ab856dbc2c77fb57a3275adec5059d63c25432ba
+  metadata.gz: 19f6ac9b45e23cc6121072ab218c177f2ce4046c
+  data.tar.gz: 3b31f09c6475ee12c5b85320c1d0f9fca3ade74d
 SHA512:
-  metadata.gz: e0f7b7e00932a884f30e7b4239322c994ad12fc952fa78a4d437bc9e005824de3c472d515bf9cb8a6d2af88c3fd40fdea5a8766ae25658b0ca5096f58664f999
-  data.tar.gz: d5bf3847cb11fd990a81e52d8fbde811322671d5498a8d547ac1ab4d2fff47ec11d75417befcd9972b27004056853d6fd26a0bb592a50521f8a0e19e922c4d83
+  metadata.gz: 49d401266bc295ce1885ab5e8bfb6df86cabc5087146416bc683d2126ba1420875e6e360360893457d6860808fa2a82f9af70d2254cd60f42efe9ecafc892cd4
+  data.tar.gz: 07518a4b60a7117efd0198fbd0b7eb69bd851547b57d8547d36d681ed273e79be5ced13d0972df8d6aabeb4ebc3d23e035761ad4169018af7f2c6c038ad30036

data/app/assets/javascripts/katello/containers/container.js

@@ -59,7 +59,7 @@ KT.container = (function(){
             noCapsules = $("#no_capsules"),
             org = getOrg(),
             spinner = $("#load_capsules"),
-            url = "/api/smart_proxies",
+            url = foreman_url("/api/smart_proxies"),
             params = {
                 organization_id: getOrg(),
                 search: "feature = \"Pulp Node\" or feature = \"Pulp\"",
@@ -94,7 +94,7 @@ KT.container = (function(){
         var environmentDropdown = $('#kt_environment_id'),
             org = getOrg(),
             spinner = $("#load_environments"),
-            url = "/katello/api/organizations/" + org + "/environments";
+            url = foreman_url("/katello/api/organizations/" + org + "/environments");
 
         resetEnvironments();
         if (org !== "") {
@@ -120,7 +120,7 @@ KT.container = (function(){
             noCV = $("#no_content_views"),
             env = getEnvironment(),
             spinner = $("#load_content_views"),
-            url = "/katello/api/organizations/" + getOrg() + "/content_views",
+            url = foreman_url("/katello/api/organizations/" + getOrg() + "/content_views");
             params = {
                 environment_id : env
             };
@@ -154,7 +154,7 @@ KT.container = (function(){
             noRepos = $("#no_repositories"),
             cv = getContentView(),
             spinner = $("#load_repositories"),
-            url = "/katello/api/repositories/",
+            url = foreman_url("/katello/api/repositories/"),
             params = {
                 organization_id: getOrg(),
                 content_view_id: cv,
@@ -191,7 +191,7 @@ KT.container = (function(){
         var repo = getRepo(),
             tagsDropdown = $("#tag_id"),
             spinner = $("#load_tags"),
-            url = "/katello/api/repositories/" + repo + "/docker_tags",
+            url = foreman_url("/katello/api/repositories/" + repo + "/docker_tags"),
             params = {};
 
         resetTags();
@@ -292,4 +292,4 @@ $(document).ready(function() {
 
 $(window).load(function() {
     KT.container.enableNext(false);
-});
+});

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -25,7 +25,8 @@ KT.hosts.fetchContentViews = function () {
     select.find('option').remove();
     if (envId) {
         KT.hosts.signalContentViewFetch(true);
-        $.get('/katello/api/v2/content_views/', {environment_id: envId, full_result: true}, function (data) {
+        var url = foreman_url('/katello/api/v2/content_views/');
+        $.get(url, {environment_id: envId, full_result: true}, function (data) {
             select.find('option').remove();
             select.append($("<option />"));
             $.each(data.results, function(index, view) {

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -95,7 +95,7 @@ KT.content_actions = (function(){
 
             $.ajax({
               type: 'DELETE',
-              url: '/katello/sync_management/' + repo_id,
+              url: foreman_url('/katello/sync_management/' + repo_id),
               dataType: 'json',
               success: function(data) {
               },
@@ -109,7 +109,8 @@ KT.content_actions = (function(){
         if (syncing.length ===0){
             return;
         }
-        updater = $.PeriodicalUpdater('/katello/sync_management/sync_status', {
+        var url = foreman_url('/katello/sync_management/sync_status');
+        updater = $.PeriodicalUpdater(url, {
               data: function(){return {repoids:getSyncing()}},
               method: 'get',
               type: 'json',
@@ -163,7 +164,7 @@ KT.content = (function(){
                 progressBar = $('<a/>').attr('class', 'progress').text(" ");
 
             if(task_id !== undefined) {
-                progressBar.attr('href', '/foreman_tasks/tasks/' + task_id)
+                progressBar.attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
             }
 
             progress = progress ? progress : 0;
@@ -185,7 +186,8 @@ KT.content = (function(){
         finishRepo = function(repo_id, state, duration, raw_state, error_details, task_id){
             var element = $("#repo-" + repo_id);
             var messages = [];
-            state = '<a href="/foreman_tasks/tasks/' + task_id + '">' + state + '</a>';
+            var url = foreman_url('/foreman_tasks/tasks/' + task_id);
+            state = '<a href="' + url + '">' + state + '</a>';
             element.find(".result .result-info").html(state);
             fadeUpdate(element.find(".duration"), duration);
 
@@ -206,7 +208,7 @@ KT.content = (function(){
             starttime = starttime === null ? katelloI18n.no_start_time : starttime;
 
             if(task_id !== undefined) {
-                pg.attr('href', '/foreman_tasks/tasks/' + task_id);
+                pg.attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
             }
 
             fadeUpdate(element.find(".start_time"), starttime);
@@ -214,7 +216,7 @@ KT.content = (function(){
             fadeUpdate(element.find(".duration"), '');
             fadeUpdate(element.find(".size"), display_size);
             element.find('.size').data('size', size);
-            element.find('.info-tipsy').attr('href', '/foreman_tasks/tasks/' + task_id);
+            element.find('.info-tipsy').attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
             progress = progress === 100 ? 99 : progress;
             value.show();
             value.animate({'width': progress },{ queue:false,

data/app/controllers/katello/api/v2/activation_keys_controller.rb

@@ -18,8 +18,8 @@ module Katello
     api :GET, "/environments/:environment_id/activation_keys"
     api :GET, "/organizations/:organization_id/activation_keys"
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
-    param :environment_id, :identifier, :desc => N_("environment identifier")
-    param :content_view_id, :identifier, :desc => N_("content view identifier")
+    param :environment_id, :number, :desc => N_("environment identifier")
+    param :content_view_id, :number, :desc => N_("content view identifier")
     param :name, String, :desc => N_("activation key name to filter by")
     param_group :search, Api::V2::ApiController
     def index
@@ -32,8 +32,8 @@ module Katello
     param :name, String, :desc => N_("name"), :required => true
     param :description, String, :desc => N_("description")
     param :environment, Hash, :desc => N_("environment")
-    param :environment_id, :identifier, :desc => N_("environment id")
-    param :content_view_id, :identifier, :desc => N_("content view id")
+    param :environment_id, :number, :desc => N_("environment id")
+    param :content_view_id, :number, :desc => N_("content view id")
     param :max_hosts, :number, :desc => N_("maximum number of registered content hosts")
     param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
     def create
@@ -48,12 +48,12 @@ module Katello
     end
 
     api :PUT, "/activation_keys/:id", N_("Update an activation key")
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("name"), :required => false
     param :description, String, :desc => N_("description")
-    param :environment_id, :identifier, :desc => N_("environment id")
-    param :content_view_id, :identifier, :desc => N_("content view id")
+    param :environment_id, :number, :desc => N_("environment id")
+    param :content_view_id, :number, :desc => N_("content view id")
     param :max_hosts, :number, :desc => N_("maximum number of registered content hosts")
     param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
     param :release_version, String, :desc => N_("content release version")
@@ -65,7 +65,7 @@ module Katello
     end
 
     api :DELETE, "/activation_keys/:id", N_("Destroy an activation key")
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     def destroy
       task = sync_task(::Actions::Katello::ActivationKey::Destroy,
                        @activation_key)
@@ -73,7 +73,7 @@ module Katello
     end
 
     api :GET, "/activation_keys/:id", N_("Show an activation key")
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def show
       respond(:resource => @activation_key)
@@ -81,7 +81,7 @@ module Katello
 
     api :POST, "/activation_keys/:id/copy", N_("Copy an activation key")
     param :new_name, String, :desc => N_("Name of new activation key"), :required => true
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def copy
       fail HttpErrors::BadRequest, _("New name cannot be blank") unless params[:new_name]
@@ -136,7 +136,14 @@ module Katello
     def product_content
       content_access_mode_all = ::Foreman::Cast.to_bool(params[:content_access_mode_all])
       content_access_mode_env = ::Foreman::Cast.to_bool(params[:content_access_mode_env])
-      content = @activation_key.available_content(content_access_mode_all, content_access_mode_env)
+
+      content_finder = ProductContentFinder.new(
+          :match_subscription => !content_access_mode_all,
+          :match_environment => content_access_mode_env,
+          :consumable => @activation_key
+      )
+
+      content = content_finder.presenter_with_overrides(@activation_key.content_overrides)
       response = {
         :results => content,
         :total => content.size,
@@ -146,7 +153,7 @@ module Katello
     end
 
     api :POST, "/activation_keys/:id/host_collections"
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :host_collection_ids, Array, :required => true, :desc => N_("List of host collection IDs to associate with activation key")
     def add_host_collections
       ids = activation_key_params[:host_collection_ids]
@@ -156,7 +163,7 @@ module Katello
     end
 
     api :PUT, "/activation_keys/:id/host_collections"
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :host_collection_ids, Array, :required => true, :desc => N_("List of host collection IDs to disassociate from the activation key")
     def remove_host_collections
       ids = activation_key_params[:host_collection_ids]
@@ -166,7 +173,7 @@ module Katello
     end
 
     api :PUT, "/activation_keys/:id/add_subscriptions", N_("Attach a subscription")
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :subscription_id, :number, :desc => N_("Subscription identifier"), :required => false
     param :quantity, :number, :desc => N_("Quantity of this subscription to add"), :required => false
     param :subscriptions, Array, :desc => N_("Array of subscriptions to add"), :required => false do
@@ -184,7 +191,7 @@ module Katello
     end
 
     api :PUT, "/activation_keys/:id/remove_subscriptions", N_("Unattach a subscription")
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :subscription_id, String, :desc => N_("Subscription ID"), :required => false
     param :subscriptions, Array, :desc => N_("Array of subscriptions to add"), :required => false do
       param :id, String, :desc => N_("Subscription Pool uuid"), :required => false
@@ -200,7 +207,7 @@ module Katello
     end
 
     api :PUT, "/activation_keys/:id/content_override", N_("Override content for activation_key")
-    param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
+    param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :content_override, Hash, :desc => N_("Content override parameters"), :deprecated => true do
       param :content_label, String, :desc => N_("Label of the content"), :required => true
       param :value, String, :desc => N_("Override to a boolean value or 'default'"), :required => true

data/app/controllers/katello/api/v2/api_controller.rb

@@ -95,8 +95,13 @@ module Katello
       query = (total.zero? || sub_total.zero?) ? [] : query
 
       scoped_search_results(query, sub_total, total, page, per_page)
-    rescue ScopedSearch::QueryNotSupported => error
-      return scoped_search_results([], sub_total, total, page, per_page, error.message)
+    rescue ScopedSearch::QueryNotSupported, ActiveRecord::StatementInvalid => error
+      message = error.message
+      if error.class == ActiveRecord::StatementInvalid
+        Rails.logger.error("Invalid search: #{error.message}")
+        message = _('Your search query was invalid. Please revise it and try again. The full error has been sent to the application logs.')
+      end
+      scoped_search_results([], sub_total, total, page, per_page, message)
     end
 
     protected

data/app/controllers/katello/api/v2/capsule_content_controller.rb

@@ -4,7 +4,8 @@ module Katello
       api_base_url "/katello/api"
     end
 
-    before_action :find_capsule
+    before_action :find_capsule, :except => [:sync, :cancel_sync, :add_lifecycle_environment, :remove_lifecycle_environment]
+    before_action :find_editable_capsule, :only => [:sync, :cancel_sync, :add_lifecycle_environment, :remove_lifecycle_environment]
     before_action :find_environment, :only => [:add_lifecycle_environment, :remove_lifecycle_environment]
     before_action :find_optional_organization, :only => [:sync_status]
 
@@ -90,13 +91,20 @@ module Katello
       respond_for_index(:collection => collection, :template => :lifecycle_environments)
     end
 
-    def find_capsule
+    def find_editable_capsule
       @capsule = SmartProxy.unscoped.authorized(:manage_capsule_content).find(params[:id])
       unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
         fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
       end
     end
 
+    def find_capsule
+      @capsule = SmartProxy.unscoped.authorized(:view_capsule_content).find(params[:id])
+      unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
+        fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
+      end
+    end
+
     def find_environment
       @environment = Katello::KTEnvironment.readable.find(params[:environment_id])
     end

data/app/controllers/katello/api/v2/content_uploads_controller.rb

@@ -7,14 +7,14 @@ module Katello
     filter_parameters :content
 
     api :POST, "/repositories/:repository_id/content_uploads", N_("Create an upload request")
-    param :repository_id, :identifier, :required => true, :desc => N_("repository id")
+    param :repository_id, :number, :required => true, :desc => N_("repository id")
     def create
       render :json => pulp_content.create_upload_request
     end
 
     api :PUT, "/repositories/:repository_id/content_uploads/:id", N_("Upload a chunk of the file's content")
-    param :repository_id, :identifier, :required => true, :desc => N_("Repository id")
-    param :id, :identifier, :required => true, :desc => N_("Upload request id")
+    param :repository_id, :number, :required => true, :desc => N_("Repository id")
+    param :id, :number, :required => true, :desc => N_("Upload request id")
     param :offset, :number, :required => true, :desc => N_("The offset in the file where the content starts")
     param :content, File, :required => true, :desc => N_("The actual file contents")
     def update
@@ -23,8 +23,8 @@ module Katello
     end
 
     api :DELETE, "/repositories/:repository_id/content_uploads/:id", N_("Delete an upload request")
-    param :repository_id, :identifier, :required => true, :desc => N_("Repository id")
-    param :id, :identifier, :required => true, :desc => N_("Upload request id")
+    param :repository_id, :number, :required => true, :desc => N_("Repository id")
+    param :id, :number, :required => true, :desc => N_("Upload request id")
     def destroy
       pulp_content.delete_upload_request(params[:id])
       render :nothing => true

data/app/controllers/katello/api/v2/content_view_components_controller.rb

@@ -7,7 +7,7 @@ module Katello
 
     api :GET, "/content_views/:composite_content_view_id/content_view_components",
         N_("List components attached to this content view")
-    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
+    param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
     def index
       respond :collection => index_response
     end
@@ -23,10 +23,10 @@ module Katello
 
     api :PUT, "/content_views/:composite_content_view_id/content_view_components/add",
                                         N_("Add components to the content view")
-    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
+    param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
     param :components, Array, :desc => N_("Array of components to add"), :required => true do
-      param :content_view_version_id, :identifier, :desc => N_("identifier of the version of the component content view")
-      param :content_view_id, :identifier,
+      param :content_view_version_id, :number, :desc => N_("identifier of the version of the component content view")
+      param :content_view_id, :number,
             :desc => N_("content view identifier of the component who's latest version is desired")
       param :latest, :bool, :desc => N_("true if the latest version of the component's content view is desired")
     end
@@ -43,7 +43,7 @@ module Katello
 
     api :PUT, "/content_views/:composite_content_view_id/content_view_components/remove",
                                         N_("Remove components from the content view")
-    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
+    param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
     param :component_ids, Array, :desc => N_("Array of content view component IDs to remove. Identifier of the component association"), :required => true
     def remove_components
       @view.remove_components(params.require(:component_ids))
@@ -53,16 +53,16 @@ module Katello
 
     api :GET, "/content_views/:composite_content_view_id/content_view_components/:id", N_("Show a content view component")
     param :composite_content_view_id, :number, :desc => N_("composite content view numeric identifier"), :required => true
-    param :id, :identifier, :desc => N_("content view component ID. Identifier of the component association"), :required => true
+    param :id, :number, :desc => N_("content view component ID. Identifier of the component association"), :required => true
     def show
       respond :resource => @component
     end
 
     api :PUT, "/content_views/:composite_content_view_id/content_view_components/:id",
         N_("Update a component associated with the content view")
-    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
-    param :id, :identifier, :desc => N_("content view component ID. Identifier of the component association"), :required => true
-    param :content_view_version_id, :identifier, :desc => N_("identifier of the version of the component content view")
+    param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
+    param :id, :number, :desc => N_("content view component ID. Identifier of the component association"), :required => true
+    param :content_view_version_id, :number, :desc => N_("identifier of the version of the component content view")
     param :latest, :bool, :desc => N_("true if the latest version of the components content view is desired")
     def update
       cvv_id = component_params[:content_view_version_id]

data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb

@@ -4,22 +4,20 @@ module Katello
     before_action :find_rule, :except => [:index, :create]
 
     api :GET, "/content_view_filters/:content_view_filter_id/rules", N_("List filter rules")
-    param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
+    param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
     param_group :search, Api::V2::ApiController
     def index
-      ids = ContentViewFilter.rule_ids_for(@filter)
-      results = ids.map { |id| ContentViewFilter.rule_class_for(@filter).find(id) }
-      collection = {
-        :results  => results.uniq,
-        :subtotal => results.count,
-        :total    => results.count
-      }
-      respond :collection => collection
+      respond(collection: scoped_search(index_relation, :name, :asc, resource_class: ContentViewFilter.rule_class_for(@filter)))
+    end
+
+    def index_relation
+      query = ContentViewFilter.rule_class_for(@filter).where(content_view_filter_id: @filter.id)
+      query
     end
 
     api :POST, "/content_view_filters/:content_view_filter_id/rules",
         N_("Create a filter rule. The parameters included should be based upon the filter type.")
-    param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
+    param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
     param :name, [String, Array], :desc => N_("package, package group, or docker tag names")
     param :uuid, String, :desc => N_("package group: uuid")
     param :version, String, :desc => N_("package: version")
@@ -56,16 +54,16 @@ module Katello
     end
 
     api :GET, "/content_view_filters/:content_view_filter_id/rules/:id", N_("Show filter rule info")
-    param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
-    param :id, :identifier, :desc => N_("rule identifier"), :required => true
+    param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
+    param :id, :number, :desc => N_("rule identifier"), :required => true
     def show
       respond :resource => @rule
     end
 
     api :PUT, "/content_view_filters/:content_view_filter_id/rules/:id",
         N_("Update a filter rule. The parameters included should be based upon the filter type.")
-    param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
-    param :id, :identifier, :desc => N_("rule identifier"), :required => true
+    param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
+    param :id, :number, :desc => N_("rule identifier"), :required => true
     param :name, String, :desc => N_("package, package group, or docker tag: name")
     param :version, String, :desc => N_("package: version")
     param :architecture, String, :desc => N_("package: architecture")
@@ -90,8 +88,8 @@ module Katello
     end
 
     api :DELETE, "/content_view_filters/:content_view_filter_id/rules/:id", N_("Delete a filter rule")
-    param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
-    param :id, :identifier, :desc => N_("rule identifier"), :required => true
+    param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
+    param :id, :number, :desc => N_("rule identifier"), :required => true
     def destroy
       @rule.destroy
       respond_for_show :resource => @rule

data/app/controllers/katello/api/v2/content_view_filters_controller.rb

@@ -10,7 +10,7 @@ module Katello
     api :get, "/content_views/:content_view_id/filters", N_("list filters")
     api :get, "/content_view_filters", N_("list filters")
     param_group :search, Api::V2::ApiController
-    param :content_view_id, :identifier, :desc => N_("content view identifier"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("filter content view filters by name")
     param :types, Array, :desc => N_("types of filters")
     def index
@@ -31,7 +31,7 @@ module Katello
 
     api :post, "/content_views/:content_view_id/filters", N_("create a filter for a content view")
     api :post, "/content_view_filters", N_("create a filter for a content view")
-    param :content_view_id, :identifier, :desc => N_("content view identifier"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the filter"), :required => true
     param :type, String, :desc => N_("type of filter (e.g. rpm, package_group, erratum, docker)"), :required => true
     param :original_packages, :bool, :desc => N_("add all packages without errata to the included/excluded list. " \
@@ -46,16 +46,16 @@ module Katello
 
     api :get, "/content_views/:content_view_id/filters/:id", N_("show filter info")
     api :get, "/content_view_filters/:id", N_("show filter info")
-    param :content_view_id, :identifier, :desc => N_("content view identifier")
-    param :id, :identifier, :desc => N_("filter identifier"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier")
+    param :id, :number, :desc => N_("filter identifier"), :required => true
     def show
       respond :resource => @filter
     end
 
     api :put, "/content_views/:content_view_id/filters/:id", N_("update a filter")
     api :put, "/content_view_filters/:id", N_("update a filter")
-    param :content_view_id, :identifier, :desc => N_("content view identifier")
-    param :id, :identifier, :desc => N_("filter identifier"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier")
+    param :id, :number, :desc => N_("filter identifier"), :required => true
     param :name, String, :desc => N_("new name for the filter")
     param :original_packages, :bool, :desc => N_("add all packages without errata to the included/excluded list. " \
                                                        "(package filter only)")
@@ -68,8 +68,8 @@ module Katello
 
     api :delete, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
     api :delete, "/content_view_filters/:id", N_("delete a filter")
-    param :content_view_id, :identifier, :desc => N_("content view identifier")
-    param :id, :identifier, :desc => N_("filter identifier"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier")
+    param :id, :number, :desc => N_("filter identifier"), :required => true
     def destroy
       @filter.destroy
       respond_for_show :resource => @filter