katello 3.5.0.rc1 → 3.5.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/assets/javascripts/katello/containers/container.js +6 -6
- data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js +2 -1
- data/app/assets/javascripts/katello/sync_management/sync_management.js +8 -6
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +23 -16
- data/app/controllers/katello/api/v2/api_controller.rb +7 -2
- data/app/controllers/katello/api/v2/capsule_content_controller.rb +10 -2
- data/app/controllers/katello/api/v2/content_uploads_controller.rb +5 -5
- data/app/controllers/katello/api/v2/content_view_components_controller.rb +9 -9
- data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb +14 -16
- data/app/controllers/katello/api/v2/content_view_filters_controller.rb +8 -8
- data/app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb +7 -7
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +12 -12
- data/app/controllers/katello/api/v2/content_views_controller.rb +5 -5
- data/app/controllers/katello/api/v2/errata_controller.rb +2 -2
- data/app/controllers/katello/api/v2/gpg_keys_controller.rb +2 -2
- data/app/controllers/katello/api/v2/host_collections_controller.rb +7 -7
- data/app/controllers/katello/api/v2/host_errata_controller.rb +4 -4
- data/app/controllers/katello/api/v2/host_packages_controller.rb +5 -5
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +9 -4
- data/app/controllers/katello/api/v2/host_tracer_controller.rb +1 -1
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +9 -1
- data/app/controllers/katello/api/v2/organizations_controller.rb +17 -3
- data/app/controllers/katello/api/v2/packages_controller.rb +2 -2
- data/app/controllers/katello/api/v2/products_controller.rb +3 -3
- data/app/controllers/katello/api/v2/repositories_controller.rb +11 -11
- data/app/controllers/katello/api/v2/repository_sets_controller.rb +1 -10
- data/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb +1 -1
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +3 -3
- data/app/helpers/katello/providers_helper.rb +4 -1
- data/app/lib/actions/candlepin/abstract.rb +1 -0
- data/app/lib/actions/katello/host/hypervisors_update.rb +1 -0
- data/app/lib/actions/katello/host/update_release_version.rb +29 -0
- data/app/lib/actions/katello/product/create.rb +3 -6
- data/app/lib/actions/katello/product/reindex_subscriptions.rb +1 -1
- data/app/lib/actions/katello/repository/scheduled_sync.rb +15 -0
- data/app/lib/actions/katello/repository/upload_files.rb +4 -0
- data/app/lib/actions/middleware/keep_session_id.rb +29 -0
- data/app/lib/katello/resources/candlepin.rb +22 -5
- data/app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb +30 -0
- data/app/models/katello/activation_key.rb +3 -33
- data/app/models/katello/candlepin/product_content.rb +1 -14
- data/app/models/katello/concerns/content_facet_host_extensions.rb +5 -1
- data/app/models/katello/concerns/content_view_filter_rule_common.rb +13 -0
- data/app/models/katello/concerns/hostgroup_extensions.rb +1 -0
- data/app/models/katello/concerns/subscription_facet_host_extensions.rb +2 -1
- data/app/models/katello/content_view_docker_filter_rule.rb +2 -1
- data/app/models/katello/content_view_erratum_filter_rule.rb +2 -1
- data/app/models/katello/content_view_package_filter_rule.rb +2 -1
- data/app/models/katello/content_view_package_group_filter_rule.rb +2 -1
- data/app/models/katello/erratum.rb +4 -5
- data/app/models/katello/glue/candlepin/owner.rb +32 -0
- data/app/models/katello/glue/pulp/repos.rb +1 -1
- data/app/models/katello/host/subscription_facet.rb +16 -0
- data/app/models/katello/repository.rb +2 -2
- data/app/models/katello/subscription.rb +4 -1
- data/app/models/katello/subscription_status.rb +8 -4
- data/app/presenters/katello/product_content_presenter.rb +7 -2
- data/app/services/katello/candlepin/consumer.rb +0 -28
- data/app/services/katello/product_content_finder.rb +37 -0
- data/app/views/foreman/smart_proxies/_content_sync.html.erb +0 -2
- data/app/views/katello/api/v2/activation_keys/base.json.rabl +34 -0
- data/app/views/katello/api/v2/activation_keys/index.json.rabl +4 -1
- data/app/views/katello/api/v2/activation_keys/product_content.json.rabl +3 -3
- data/app/views/katello/api/v2/activation_keys/show.json.rabl +2 -38
- data/app/views/katello/api/v2/common/releases.json.rabl +7 -0
- data/config/routes/api/v2.rb +1 -0
- data/config/routes/overrides.rb +1 -0
- data/db/migrate/20171010170443_add_index_to_katello_content_facet_errata.rb +5 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-key.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-host-collections.controller.js +8 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-copy.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js +7 -10
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-host-collections.controller.js +7 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-host-collections-table.html +1 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +7 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsules/capsule.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/api-error-handler.service.js +6 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-environment-modal.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-host-collections-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-release-version-modal.controller.js +62 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html +56 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js +11 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js +10 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js +6 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-traces.controller.js +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-base-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js +8 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js +10 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +6 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-view.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-deletion.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-confirm.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-component.factory.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-promotion.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-publish.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-versions.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-errata-filter.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-package-group-filter.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js +11 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/docker-tag-filter.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/edit-filter.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/errata-filter-list.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-repositories.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filters.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-group-list-filter.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/rule.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-versions.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-modules.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifest.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-details.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment.controller.js +5 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environment.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/new-environment.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/new-environment.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js +9 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum-content-hosts.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/erratum.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/file.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/gpg-key-details-info.controller.js +6 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/gpg-key-details.controller.js +4 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-key.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/new-gpg-key.controller.js +6 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-copy.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js +13 -22
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-hosts.controller.js +6 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/host-collection.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-erratum.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organization.factory.js +7 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branch.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/package-groups/package-group.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/package.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/product-bulk-action.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-sync-plan-modal.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details-info.controller.js +5 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js +15 -14
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-advanced-sync.controller.js +6 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +9 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js +7 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-files.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ostree-branches.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-packages.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-puppet-modules.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +5 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository.factory.js +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html +0 -20
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-info.html +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js +4 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js +5 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-base.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/product-form.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/product.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.controller.js +7 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/puppet-module.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-module.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-set.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/setting.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-details.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-import.controller.js +9 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.factory.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-add-products.controller.js +6 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details-info.controller.js +5 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-products.controller.js +8 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-products.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/new-sync-plan.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plan.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task.factory.js +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks.module.js +3 -3
- data/lib/katello/permission_creator.rb +3 -2
- data/lib/katello/permissions/host_permissions.rb +1 -0
- data/lib/katello/permissions/organization_permissions.rb +1 -0
- data/lib/katello/tasks/clean_installed_packages.rake +20 -3
- data/lib/katello/version.rb +1 -1
- metadata +17 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 19f6ac9b45e23cc6121072ab218c177f2ce4046c
|
4
|
+
data.tar.gz: 3b31f09c6475ee12c5b85320c1d0f9fca3ade74d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 49d401266bc295ce1885ab5e8bfb6df86cabc5087146416bc683d2126ba1420875e6e360360893457d6860808fa2a82f9af70d2254cd60f42efe9ecafc892cd4
|
7
|
+
data.tar.gz: 07518a4b60a7117efd0198fbd0b7eb69bd851547b57d8547d36d681ed273e79be5ced13d0972df8d6aabeb4ebc3d23e035761ad4169018af7f2c6c038ad30036
|
@@ -59,7 +59,7 @@ KT.container = (function(){
|
|
59
59
|
noCapsules = $("#no_capsules"),
|
60
60
|
org = getOrg(),
|
61
61
|
spinner = $("#load_capsules"),
|
62
|
-
url = "/api/smart_proxies",
|
62
|
+
url = foreman_url("/api/smart_proxies"),
|
63
63
|
params = {
|
64
64
|
organization_id: getOrg(),
|
65
65
|
search: "feature = \"Pulp Node\" or feature = \"Pulp\"",
|
@@ -94,7 +94,7 @@ KT.container = (function(){
|
|
94
94
|
var environmentDropdown = $('#kt_environment_id'),
|
95
95
|
org = getOrg(),
|
96
96
|
spinner = $("#load_environments"),
|
97
|
-
url = "/katello/api/organizations/" + org + "/environments";
|
97
|
+
url = foreman_url("/katello/api/organizations/" + org + "/environments");
|
98
98
|
|
99
99
|
resetEnvironments();
|
100
100
|
if (org !== "") {
|
@@ -120,7 +120,7 @@ KT.container = (function(){
|
|
120
120
|
noCV = $("#no_content_views"),
|
121
121
|
env = getEnvironment(),
|
122
122
|
spinner = $("#load_content_views"),
|
123
|
-
url = "/katello/api/organizations/" + getOrg() + "/content_views"
|
123
|
+
url = foreman_url("/katello/api/organizations/" + getOrg() + "/content_views");
|
124
124
|
params = {
|
125
125
|
environment_id : env
|
126
126
|
};
|
@@ -154,7 +154,7 @@ KT.container = (function(){
|
|
154
154
|
noRepos = $("#no_repositories"),
|
155
155
|
cv = getContentView(),
|
156
156
|
spinner = $("#load_repositories"),
|
157
|
-
url = "/katello/api/repositories/",
|
157
|
+
url = foreman_url("/katello/api/repositories/"),
|
158
158
|
params = {
|
159
159
|
organization_id: getOrg(),
|
160
160
|
content_view_id: cv,
|
@@ -191,7 +191,7 @@ KT.container = (function(){
|
|
191
191
|
var repo = getRepo(),
|
192
192
|
tagsDropdown = $("#tag_id"),
|
193
193
|
spinner = $("#load_tags"),
|
194
|
-
url = "/katello/api/repositories/" + repo + "/docker_tags",
|
194
|
+
url = foreman_url("/katello/api/repositories/" + repo + "/docker_tags"),
|
195
195
|
params = {};
|
196
196
|
|
197
197
|
resetTags();
|
@@ -292,4 +292,4 @@ $(document).ready(function() {
|
|
292
292
|
|
293
293
|
$(window).load(function() {
|
294
294
|
KT.container.enableNext(false);
|
295
|
-
});
|
295
|
+
});
|
@@ -25,7 +25,8 @@ KT.hosts.fetchContentViews = function () {
|
|
25
25
|
select.find('option').remove();
|
26
26
|
if (envId) {
|
27
27
|
KT.hosts.signalContentViewFetch(true);
|
28
|
-
|
28
|
+
var url = foreman_url('/katello/api/v2/content_views/');
|
29
|
+
$.get(url, {environment_id: envId, full_result: true}, function (data) {
|
29
30
|
select.find('option').remove();
|
30
31
|
select.append($("<option />"));
|
31
32
|
$.each(data.results, function(index, view) {
|
@@ -95,7 +95,7 @@ KT.content_actions = (function(){
|
|
95
95
|
|
96
96
|
$.ajax({
|
97
97
|
type: 'DELETE',
|
98
|
-
url: '/katello/sync_management/' + repo_id,
|
98
|
+
url: foreman_url('/katello/sync_management/' + repo_id),
|
99
99
|
dataType: 'json',
|
100
100
|
success: function(data) {
|
101
101
|
},
|
@@ -109,7 +109,8 @@ KT.content_actions = (function(){
|
|
109
109
|
if (syncing.length ===0){
|
110
110
|
return;
|
111
111
|
}
|
112
|
-
|
112
|
+
var url = foreman_url('/katello/sync_management/sync_status');
|
113
|
+
updater = $.PeriodicalUpdater(url, {
|
113
114
|
data: function(){return {repoids:getSyncing()}},
|
114
115
|
method: 'get',
|
115
116
|
type: 'json',
|
@@ -163,7 +164,7 @@ KT.content = (function(){
|
|
163
164
|
progressBar = $('<a/>').attr('class', 'progress').text(" ");
|
164
165
|
|
165
166
|
if(task_id !== undefined) {
|
166
|
-
progressBar.attr('href', '/foreman_tasks/tasks/' + task_id)
|
167
|
+
progressBar.attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
|
167
168
|
}
|
168
169
|
|
169
170
|
progress = progress ? progress : 0;
|
@@ -185,7 +186,8 @@ KT.content = (function(){
|
|
185
186
|
finishRepo = function(repo_id, state, duration, raw_state, error_details, task_id){
|
186
187
|
var element = $("#repo-" + repo_id);
|
187
188
|
var messages = [];
|
188
|
-
|
189
|
+
var url = foreman_url('/foreman_tasks/tasks/' + task_id);
|
190
|
+
state = '<a href="' + url + '">' + state + '</a>';
|
189
191
|
element.find(".result .result-info").html(state);
|
190
192
|
fadeUpdate(element.find(".duration"), duration);
|
191
193
|
|
@@ -206,7 +208,7 @@ KT.content = (function(){
|
|
206
208
|
starttime = starttime === null ? katelloI18n.no_start_time : starttime;
|
207
209
|
|
208
210
|
if(task_id !== undefined) {
|
209
|
-
pg.attr('href', '/foreman_tasks/tasks/' + task_id);
|
211
|
+
pg.attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
|
210
212
|
}
|
211
213
|
|
212
214
|
fadeUpdate(element.find(".start_time"), starttime);
|
@@ -214,7 +216,7 @@ KT.content = (function(){
|
|
214
216
|
fadeUpdate(element.find(".duration"), '');
|
215
217
|
fadeUpdate(element.find(".size"), display_size);
|
216
218
|
element.find('.size').data('size', size);
|
217
|
-
element.find('.info-tipsy').attr('href', '/foreman_tasks/tasks/' + task_id);
|
219
|
+
element.find('.info-tipsy').attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
|
218
220
|
progress = progress === 100 ? 99 : progress;
|
219
221
|
value.show();
|
220
222
|
value.animate({'width': progress },{ queue:false,
|
@@ -18,8 +18,8 @@ module Katello
|
|
18
18
|
api :GET, "/environments/:environment_id/activation_keys"
|
19
19
|
api :GET, "/organizations/:organization_id/activation_keys"
|
20
20
|
param :organization_id, :number, :desc => N_("organization identifier"), :required => true
|
21
|
-
param :environment_id, :
|
22
|
-
param :content_view_id, :
|
21
|
+
param :environment_id, :number, :desc => N_("environment identifier")
|
22
|
+
param :content_view_id, :number, :desc => N_("content view identifier")
|
23
23
|
param :name, String, :desc => N_("activation key name to filter by")
|
24
24
|
param_group :search, Api::V2::ApiController
|
25
25
|
def index
|
@@ -32,8 +32,8 @@ module Katello
|
|
32
32
|
param :name, String, :desc => N_("name"), :required => true
|
33
33
|
param :description, String, :desc => N_("description")
|
34
34
|
param :environment, Hash, :desc => N_("environment")
|
35
|
-
param :environment_id, :
|
36
|
-
param :content_view_id, :
|
35
|
+
param :environment_id, :number, :desc => N_("environment id")
|
36
|
+
param :content_view_id, :number, :desc => N_("content view id")
|
37
37
|
param :max_hosts, :number, :desc => N_("maximum number of registered content hosts")
|
38
38
|
param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
|
39
39
|
def create
|
@@ -48,12 +48,12 @@ module Katello
|
|
48
48
|
end
|
49
49
|
|
50
50
|
api :PUT, "/activation_keys/:id", N_("Update an activation key")
|
51
|
-
param :id, :
|
51
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
52
52
|
param :organization_id, :number, :desc => N_("organization identifier"), :required => true
|
53
53
|
param :name, String, :desc => N_("name"), :required => false
|
54
54
|
param :description, String, :desc => N_("description")
|
55
|
-
param :environment_id, :
|
56
|
-
param :content_view_id, :
|
55
|
+
param :environment_id, :number, :desc => N_("environment id")
|
56
|
+
param :content_view_id, :number, :desc => N_("content view id")
|
57
57
|
param :max_hosts, :number, :desc => N_("maximum number of registered content hosts")
|
58
58
|
param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
|
59
59
|
param :release_version, String, :desc => N_("content release version")
|
@@ -65,7 +65,7 @@ module Katello
|
|
65
65
|
end
|
66
66
|
|
67
67
|
api :DELETE, "/activation_keys/:id", N_("Destroy an activation key")
|
68
|
-
param :id, :
|
68
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
69
69
|
def destroy
|
70
70
|
task = sync_task(::Actions::Katello::ActivationKey::Destroy,
|
71
71
|
@activation_key)
|
@@ -73,7 +73,7 @@ module Katello
|
|
73
73
|
end
|
74
74
|
|
75
75
|
api :GET, "/activation_keys/:id", N_("Show an activation key")
|
76
|
-
param :id, :
|
76
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
77
77
|
param :organization_id, :number, :desc => N_("organization identifier"), :required => false
|
78
78
|
def show
|
79
79
|
respond(:resource => @activation_key)
|
@@ -81,7 +81,7 @@ module Katello
|
|
81
81
|
|
82
82
|
api :POST, "/activation_keys/:id/copy", N_("Copy an activation key")
|
83
83
|
param :new_name, String, :desc => N_("Name of new activation key"), :required => true
|
84
|
-
param :id, :
|
84
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
85
85
|
param :organization_id, :number, :desc => N_("organization identifier"), :required => false
|
86
86
|
def copy
|
87
87
|
fail HttpErrors::BadRequest, _("New name cannot be blank") unless params[:new_name]
|
@@ -136,7 +136,14 @@ module Katello
|
|
136
136
|
def product_content
|
137
137
|
content_access_mode_all = ::Foreman::Cast.to_bool(params[:content_access_mode_all])
|
138
138
|
content_access_mode_env = ::Foreman::Cast.to_bool(params[:content_access_mode_env])
|
139
|
-
|
139
|
+
|
140
|
+
content_finder = ProductContentFinder.new(
|
141
|
+
:match_subscription => !content_access_mode_all,
|
142
|
+
:match_environment => content_access_mode_env,
|
143
|
+
:consumable => @activation_key
|
144
|
+
)
|
145
|
+
|
146
|
+
content = content_finder.presenter_with_overrides(@activation_key.content_overrides)
|
140
147
|
response = {
|
141
148
|
:results => content,
|
142
149
|
:total => content.size,
|
@@ -146,7 +153,7 @@ module Katello
|
|
146
153
|
end
|
147
154
|
|
148
155
|
api :POST, "/activation_keys/:id/host_collections"
|
149
|
-
param :id, :
|
156
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
150
157
|
param :host_collection_ids, Array, :required => true, :desc => N_("List of host collection IDs to associate with activation key")
|
151
158
|
def add_host_collections
|
152
159
|
ids = activation_key_params[:host_collection_ids]
|
@@ -156,7 +163,7 @@ module Katello
|
|
156
163
|
end
|
157
164
|
|
158
165
|
api :PUT, "/activation_keys/:id/host_collections"
|
159
|
-
param :id, :
|
166
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
160
167
|
param :host_collection_ids, Array, :required => true, :desc => N_("List of host collection IDs to disassociate from the activation key")
|
161
168
|
def remove_host_collections
|
162
169
|
ids = activation_key_params[:host_collection_ids]
|
@@ -166,7 +173,7 @@ module Katello
|
|
166
173
|
end
|
167
174
|
|
168
175
|
api :PUT, "/activation_keys/:id/add_subscriptions", N_("Attach a subscription")
|
169
|
-
param :id, :
|
176
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
170
177
|
param :subscription_id, :number, :desc => N_("Subscription identifier"), :required => false
|
171
178
|
param :quantity, :number, :desc => N_("Quantity of this subscription to add"), :required => false
|
172
179
|
param :subscriptions, Array, :desc => N_("Array of subscriptions to add"), :required => false do
|
@@ -184,7 +191,7 @@ module Katello
|
|
184
191
|
end
|
185
192
|
|
186
193
|
api :PUT, "/activation_keys/:id/remove_subscriptions", N_("Unattach a subscription")
|
187
|
-
param :id, :
|
194
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
188
195
|
param :subscription_id, String, :desc => N_("Subscription ID"), :required => false
|
189
196
|
param :subscriptions, Array, :desc => N_("Array of subscriptions to add"), :required => false do
|
190
197
|
param :id, String, :desc => N_("Subscription Pool uuid"), :required => false
|
@@ -200,7 +207,7 @@ module Katello
|
|
200
207
|
end
|
201
208
|
|
202
209
|
api :PUT, "/activation_keys/:id/content_override", N_("Override content for activation_key")
|
203
|
-
param :id, :
|
210
|
+
param :id, :number, :desc => N_("ID of the activation key"), :required => true
|
204
211
|
param :content_override, Hash, :desc => N_("Content override parameters"), :deprecated => true do
|
205
212
|
param :content_label, String, :desc => N_("Label of the content"), :required => true
|
206
213
|
param :value, String, :desc => N_("Override to a boolean value or 'default'"), :required => true
|
@@ -95,8 +95,13 @@ module Katello
|
|
95
95
|
query = (total.zero? || sub_total.zero?) ? [] : query
|
96
96
|
|
97
97
|
scoped_search_results(query, sub_total, total, page, per_page)
|
98
|
-
rescue ScopedSearch::QueryNotSupported => error
|
99
|
-
|
98
|
+
rescue ScopedSearch::QueryNotSupported, ActiveRecord::StatementInvalid => error
|
99
|
+
message = error.message
|
100
|
+
if error.class == ActiveRecord::StatementInvalid
|
101
|
+
Rails.logger.error("Invalid search: #{error.message}")
|
102
|
+
message = _('Your search query was invalid. Please revise it and try again. The full error has been sent to the application logs.')
|
103
|
+
end
|
104
|
+
scoped_search_results([], sub_total, total, page, per_page, message)
|
100
105
|
end
|
101
106
|
|
102
107
|
protected
|
@@ -4,7 +4,8 @@ module Katello
|
|
4
4
|
api_base_url "/katello/api"
|
5
5
|
end
|
6
6
|
|
7
|
-
before_action :find_capsule
|
7
|
+
before_action :find_capsule, :except => [:sync, :cancel_sync, :add_lifecycle_environment, :remove_lifecycle_environment]
|
8
|
+
before_action :find_editable_capsule, :only => [:sync, :cancel_sync, :add_lifecycle_environment, :remove_lifecycle_environment]
|
8
9
|
before_action :find_environment, :only => [:add_lifecycle_environment, :remove_lifecycle_environment]
|
9
10
|
before_action :find_optional_organization, :only => [:sync_status]
|
10
11
|
|
@@ -90,13 +91,20 @@ module Katello
|
|
90
91
|
respond_for_index(:collection => collection, :template => :lifecycle_environments)
|
91
92
|
end
|
92
93
|
|
93
|
-
def
|
94
|
+
def find_editable_capsule
|
94
95
|
@capsule = SmartProxy.unscoped.authorized(:manage_capsule_content).find(params[:id])
|
95
96
|
unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
|
96
97
|
fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
|
97
98
|
end
|
98
99
|
end
|
99
100
|
|
101
|
+
def find_capsule
|
102
|
+
@capsule = SmartProxy.unscoped.authorized(:view_capsule_content).find(params[:id])
|
103
|
+
unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
|
104
|
+
fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
100
108
|
def find_environment
|
101
109
|
@environment = Katello::KTEnvironment.readable.find(params[:environment_id])
|
102
110
|
end
|
@@ -7,14 +7,14 @@ module Katello
|
|
7
7
|
filter_parameters :content
|
8
8
|
|
9
9
|
api :POST, "/repositories/:repository_id/content_uploads", N_("Create an upload request")
|
10
|
-
param :repository_id, :
|
10
|
+
param :repository_id, :number, :required => true, :desc => N_("repository id")
|
11
11
|
def create
|
12
12
|
render :json => pulp_content.create_upload_request
|
13
13
|
end
|
14
14
|
|
15
15
|
api :PUT, "/repositories/:repository_id/content_uploads/:id", N_("Upload a chunk of the file's content")
|
16
|
-
param :repository_id, :
|
17
|
-
param :id, :
|
16
|
+
param :repository_id, :number, :required => true, :desc => N_("Repository id")
|
17
|
+
param :id, :number, :required => true, :desc => N_("Upload request id")
|
18
18
|
param :offset, :number, :required => true, :desc => N_("The offset in the file where the content starts")
|
19
19
|
param :content, File, :required => true, :desc => N_("The actual file contents")
|
20
20
|
def update
|
@@ -23,8 +23,8 @@ module Katello
|
|
23
23
|
end
|
24
24
|
|
25
25
|
api :DELETE, "/repositories/:repository_id/content_uploads/:id", N_("Delete an upload request")
|
26
|
-
param :repository_id, :
|
27
|
-
param :id, :
|
26
|
+
param :repository_id, :number, :required => true, :desc => N_("Repository id")
|
27
|
+
param :id, :number, :required => true, :desc => N_("Upload request id")
|
28
28
|
def destroy
|
29
29
|
pulp_content.delete_upload_request(params[:id])
|
30
30
|
render :nothing => true
|
@@ -7,7 +7,7 @@ module Katello
|
|
7
7
|
|
8
8
|
api :GET, "/content_views/:composite_content_view_id/content_view_components",
|
9
9
|
N_("List components attached to this content view")
|
10
|
-
param :composite_content_view_id, :
|
10
|
+
param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
|
11
11
|
def index
|
12
12
|
respond :collection => index_response
|
13
13
|
end
|
@@ -23,10 +23,10 @@ module Katello
|
|
23
23
|
|
24
24
|
api :PUT, "/content_views/:composite_content_view_id/content_view_components/add",
|
25
25
|
N_("Add components to the content view")
|
26
|
-
param :composite_content_view_id, :
|
26
|
+
param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
|
27
27
|
param :components, Array, :desc => N_("Array of components to add"), :required => true do
|
28
|
-
param :content_view_version_id, :
|
29
|
-
param :content_view_id, :
|
28
|
+
param :content_view_version_id, :number, :desc => N_("identifier of the version of the component content view")
|
29
|
+
param :content_view_id, :number,
|
30
30
|
:desc => N_("content view identifier of the component who's latest version is desired")
|
31
31
|
param :latest, :bool, :desc => N_("true if the latest version of the component's content view is desired")
|
32
32
|
end
|
@@ -43,7 +43,7 @@ module Katello
|
|
43
43
|
|
44
44
|
api :PUT, "/content_views/:composite_content_view_id/content_view_components/remove",
|
45
45
|
N_("Remove components from the content view")
|
46
|
-
param :composite_content_view_id, :
|
46
|
+
param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
|
47
47
|
param :component_ids, Array, :desc => N_("Array of content view component IDs to remove. Identifier of the component association"), :required => true
|
48
48
|
def remove_components
|
49
49
|
@view.remove_components(params.require(:component_ids))
|
@@ -53,16 +53,16 @@ module Katello
|
|
53
53
|
|
54
54
|
api :GET, "/content_views/:composite_content_view_id/content_view_components/:id", N_("Show a content view component")
|
55
55
|
param :composite_content_view_id, :number, :desc => N_("composite content view numeric identifier"), :required => true
|
56
|
-
param :id, :
|
56
|
+
param :id, :number, :desc => N_("content view component ID. Identifier of the component association"), :required => true
|
57
57
|
def show
|
58
58
|
respond :resource => @component
|
59
59
|
end
|
60
60
|
|
61
61
|
api :PUT, "/content_views/:composite_content_view_id/content_view_components/:id",
|
62
62
|
N_("Update a component associated with the content view")
|
63
|
-
param :composite_content_view_id, :
|
64
|
-
param :id, :
|
65
|
-
param :content_view_version_id, :
|
63
|
+
param :composite_content_view_id, :number, :desc => N_("composite content view identifier"), :required => true
|
64
|
+
param :id, :number, :desc => N_("content view component ID. Identifier of the component association"), :required => true
|
65
|
+
param :content_view_version_id, :number, :desc => N_("identifier of the version of the component content view")
|
66
66
|
param :latest, :bool, :desc => N_("true if the latest version of the components content view is desired")
|
67
67
|
def update
|
68
68
|
cvv_id = component_params[:content_view_version_id]
|
@@ -4,22 +4,20 @@ module Katello
|
|
4
4
|
before_action :find_rule, :except => [:index, :create]
|
5
5
|
|
6
6
|
api :GET, "/content_view_filters/:content_view_filter_id/rules", N_("List filter rules")
|
7
|
-
param :content_view_filter_id, :
|
7
|
+
param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
|
8
8
|
param_group :search, Api::V2::ApiController
|
9
9
|
def index
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
}
|
17
|
-
respond :collection => collection
|
10
|
+
respond(collection: scoped_search(index_relation, :name, :asc, resource_class: ContentViewFilter.rule_class_for(@filter)))
|
11
|
+
end
|
12
|
+
|
13
|
+
def index_relation
|
14
|
+
query = ContentViewFilter.rule_class_for(@filter).where(content_view_filter_id: @filter.id)
|
15
|
+
query
|
18
16
|
end
|
19
17
|
|
20
18
|
api :POST, "/content_view_filters/:content_view_filter_id/rules",
|
21
19
|
N_("Create a filter rule. The parameters included should be based upon the filter type.")
|
22
|
-
param :content_view_filter_id, :
|
20
|
+
param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
|
23
21
|
param :name, [String, Array], :desc => N_("package, package group, or docker tag names")
|
24
22
|
param :uuid, String, :desc => N_("package group: uuid")
|
25
23
|
param :version, String, :desc => N_("package: version")
|
@@ -56,16 +54,16 @@ module Katello
|
|
56
54
|
end
|
57
55
|
|
58
56
|
api :GET, "/content_view_filters/:content_view_filter_id/rules/:id", N_("Show filter rule info")
|
59
|
-
param :content_view_filter_id, :
|
60
|
-
param :id, :
|
57
|
+
param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
|
58
|
+
param :id, :number, :desc => N_("rule identifier"), :required => true
|
61
59
|
def show
|
62
60
|
respond :resource => @rule
|
63
61
|
end
|
64
62
|
|
65
63
|
api :PUT, "/content_view_filters/:content_view_filter_id/rules/:id",
|
66
64
|
N_("Update a filter rule. The parameters included should be based upon the filter type.")
|
67
|
-
param :content_view_filter_id, :
|
68
|
-
param :id, :
|
65
|
+
param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
|
66
|
+
param :id, :number, :desc => N_("rule identifier"), :required => true
|
69
67
|
param :name, String, :desc => N_("package, package group, or docker tag: name")
|
70
68
|
param :version, String, :desc => N_("package: version")
|
71
69
|
param :architecture, String, :desc => N_("package: architecture")
|
@@ -90,8 +88,8 @@ module Katello
|
|
90
88
|
end
|
91
89
|
|
92
90
|
api :DELETE, "/content_view_filters/:content_view_filter_id/rules/:id", N_("Delete a filter rule")
|
93
|
-
param :content_view_filter_id, :
|
94
|
-
param :id, :
|
91
|
+
param :content_view_filter_id, :number, :desc => N_("filter identifier"), :required => true
|
92
|
+
param :id, :number, :desc => N_("rule identifier"), :required => true
|
95
93
|
def destroy
|
96
94
|
@rule.destroy
|
97
95
|
respond_for_show :resource => @rule
|
@@ -10,7 +10,7 @@ module Katello
|
|
10
10
|
api :get, "/content_views/:content_view_id/filters", N_("list filters")
|
11
11
|
api :get, "/content_view_filters", N_("list filters")
|
12
12
|
param_group :search, Api::V2::ApiController
|
13
|
-
param :content_view_id, :
|
13
|
+
param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
|
14
14
|
param :name, String, :desc => N_("filter content view filters by name")
|
15
15
|
param :types, Array, :desc => N_("types of filters")
|
16
16
|
def index
|
@@ -31,7 +31,7 @@ module Katello
|
|
31
31
|
|
32
32
|
api :post, "/content_views/:content_view_id/filters", N_("create a filter for a content view")
|
33
33
|
api :post, "/content_view_filters", N_("create a filter for a content view")
|
34
|
-
param :content_view_id, :
|
34
|
+
param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
|
35
35
|
param :name, String, :desc => N_("name of the filter"), :required => true
|
36
36
|
param :type, String, :desc => N_("type of filter (e.g. rpm, package_group, erratum, docker)"), :required => true
|
37
37
|
param :original_packages, :bool, :desc => N_("add all packages without errata to the included/excluded list. " \
|
@@ -46,16 +46,16 @@ module Katello
|
|
46
46
|
|
47
47
|
api :get, "/content_views/:content_view_id/filters/:id", N_("show filter info")
|
48
48
|
api :get, "/content_view_filters/:id", N_("show filter info")
|
49
|
-
param :content_view_id, :
|
50
|
-
param :id, :
|
49
|
+
param :content_view_id, :number, :desc => N_("content view identifier")
|
50
|
+
param :id, :number, :desc => N_("filter identifier"), :required => true
|
51
51
|
def show
|
52
52
|
respond :resource => @filter
|
53
53
|
end
|
54
54
|
|
55
55
|
api :put, "/content_views/:content_view_id/filters/:id", N_("update a filter")
|
56
56
|
api :put, "/content_view_filters/:id", N_("update a filter")
|
57
|
-
param :content_view_id, :
|
58
|
-
param :id, :
|
57
|
+
param :content_view_id, :number, :desc => N_("content view identifier")
|
58
|
+
param :id, :number, :desc => N_("filter identifier"), :required => true
|
59
59
|
param :name, String, :desc => N_("new name for the filter")
|
60
60
|
param :original_packages, :bool, :desc => N_("add all packages without errata to the included/excluded list. " \
|
61
61
|
"(package filter only)")
|
@@ -68,8 +68,8 @@ module Katello
|
|
68
68
|
|
69
69
|
api :delete, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
|
70
70
|
api :delete, "/content_view_filters/:id", N_("delete a filter")
|
71
|
-
param :content_view_id, :
|
72
|
-
param :id, :
|
71
|
+
param :content_view_id, :number, :desc => N_("content view identifier")
|
72
|
+
param :id, :number, :desc => N_("filter identifier"), :required => true
|
73
73
|
def destroy
|
74
74
|
@filter.destroy
|
75
75
|
respond_for_show :resource => @filter
|