katello 4.0.3 → 4.1.0.rc1
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/hosts/host_and_hostgroup_edit.js +0 -33
- data/app/assets/stylesheets/katello/contents.scss +1 -1
- data/app/controllers/katello/api/registry/registry_proxies_controller.rb +5 -11
- data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb +2 -9
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +10 -24
- data/app/controllers/katello/api/v2/api_controller.rb +15 -3
- data/app/controllers/katello/api/v2/content_credentials_controller.rb +1 -1
- data/app/controllers/katello/api/v2/content_export_incrementals_controller.rb +1 -8
- data/app/controllers/katello/api/v2/content_exports_controller.rb +1 -14
- data/app/controllers/katello/api/v2/content_imports_controller.rb +38 -15
- data/app/controllers/katello/api/v2/content_uploads_controller.rb +1 -1
- data/app/controllers/katello/api/v2/content_view_components_controller.rb +22 -1
- data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb +6 -1
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +2 -59
- data/app/controllers/katello/api/v2/content_views_controller.rb +3 -58
- data/app/controllers/katello/api/v2/host_errata_controller.rb +7 -6
- data/app/controllers/katello/api/v2/host_packages_controller.rb +4 -4
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +18 -22
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +16 -16
- data/app/controllers/katello/api/v2/organizations_controller.rb +2 -1
- data/app/controllers/katello/api/v2/package_groups_controller.rb +4 -0
- data/app/controllers/katello/api/v2/repositories_controller.rb +13 -12
- data/app/controllers/katello/api/v2/repository_sets_controller.rb +50 -4
- data/app/controllers/katello/api/v2/subscriptions_controller.rb +7 -1
- data/app/controllers/katello/concerns/api/api_controller.rb +10 -0
- data/app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb +46 -0
- data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb +8 -0
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +31 -22
- data/app/controllers/katello/concerns/hosts_controller_extensions.rb +0 -8
- data/app/controllers/katello/concerns/organizations_controller_extensions.rb +1 -1
- data/app/controllers/katello/concerns/registration_commands_controller_extensions.rb +34 -0
- data/app/helpers/katello/katello_urls_helper.rb +23 -0
- data/app/lib/actions/candlepin/owner/import.rb +10 -3
- data/app/lib/actions/candlepin/product/content_update.rb +1 -1
- data/app/lib/actions/foreman/environment/destroy.rb +2 -2
- data/app/lib/actions/katello/agent_action.rb +1 -6
- data/app/lib/actions/katello/capsule_content/refresh_repos.rb +0 -7
- data/app/lib/actions/katello/capsule_content/sync.rb +1 -1
- data/app/lib/actions/katello/capsule_content/sync_capsule.rb +1 -2
- data/app/lib/actions/katello/content_view/add_to_environment.rb +9 -7
- data/app/lib/actions/katello/content_view/incremental_updates.rb +3 -10
- data/app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb +2 -3
- data/app/lib/actions/katello/content_view/promote_to_environment.rb +1 -4
- data/app/lib/actions/katello/content_view/publish.rb +21 -31
- data/app/lib/actions/katello/content_view_environment/destroy.rb +0 -5
- data/app/lib/actions/katello/content_view_version/auto_create_products.rb +22 -0
- data/app/lib/actions/katello/content_view_version/auto_create_repositories.rb +22 -0
- data/app/lib/actions/katello/content_view_version/destroy.rb +0 -10
- data/app/lib/actions/katello/content_view_version/export.rb +20 -22
- data/app/lib/actions/katello/content_view_version/import.rb +27 -13
- data/app/lib/actions/katello/content_view_version/import_library.rb +4 -2
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +12 -67
- data/app/lib/actions/katello/content_view_version/republish_repositories.rb +0 -4
- data/app/lib/actions/katello/content_view_version/reset_content_view_repositories_from_metadata.rb +11 -0
- data/app/lib/actions/katello/foreman/content_update.rb +0 -3
- data/app/lib/actions/katello/host/auto_attach_subscriptions.rb +0 -4
- data/app/lib/actions/katello/organization/manifest_import.rb +7 -1
- data/app/lib/actions/katello/organization/manifest_refresh.rb +28 -7
- data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb +2 -2
- data/app/lib/actions/katello/product/create.rb +0 -1
- data/app/lib/actions/katello/repository/check_matching_content.rb +4 -3
- data/app/lib/actions/katello/repository/destroy.rb +1 -1
- data/app/lib/actions/katello/repository/discover.rb +1 -1
- data/app/lib/actions/katello/repository/filtered_index_content.rb +1 -4
- data/app/lib/actions/katello/repository/import_upload.rb +0 -1
- data/app/lib/actions/katello/repository/update.rb +0 -1
- data/app/lib/actions/middleware/record_smart_proxy_sync_history.rb +0 -5
- data/app/lib/actions/pulp/repository/create.rb +1 -7
- data/app/lib/actions/pulp/repository/distributor_publish.rb +2 -10
- data/app/lib/actions/pulp/repository/sync.rb +1 -3
- data/app/lib/actions/pulp3/capsule_content/refresh_content_guard.rb +17 -0
- data/app/lib/actions/pulp3/content_guard/refresh.rb +10 -6
- data/app/lib/actions/pulp3/content_view_version/create_export_history.rb +57 -0
- data/app/lib/actions/pulp3/content_view_version/create_import_history.rb +34 -0
- data/app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb +2 -3
- data/app/lib/actions/pulp3/orchestration/content_view_version/export.rb +34 -51
- data/app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb +2 -2
- data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb +13 -1
- data/app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb +1 -1
- data/app/lib/actions/pulp3/orchestration/repository/sync.rb +1 -0
- data/app/lib/actions/pulp3/repository/refresh_remote.rb +17 -0
- data/app/lib/katello/agent/client_message_handler.rb +3 -11
- data/app/lib/katello/concerns/base_template_scope_extensions.rb +117 -3
- data/app/lib/katello/errors.rb +6 -11
- data/app/lib/katello/event_daemon/monitor.rb +0 -1
- data/app/lib/katello/event_daemon/runner.rb +2 -2
- data/app/lib/katello/event_daemon/services/agent_event_receiver.rb +10 -6
- data/app/lib/katello/http_resource.rb +1 -6
- data/app/lib/katello/logging.rb +11 -6
- data/app/lib/katello/qpid/connection.rb +1 -3
- data/app/lib/katello/repo_discovery.rb +15 -1
- data/app/lib/katello/resources/candlepin/owner.rb +3 -2
- data/app/lib/katello/resources/candlepin/pool.rb +6 -2
- data/app/lib/katello/resources/candlepin.rb +10 -0
- data/app/lib/katello/util/package.rb +1 -1
- data/app/lib/katello/util/pulpcore_content_filters.rb +1 -1
- data/app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb +0 -6
- data/app/models/katello/authorization/content_view.rb +8 -0
- data/app/models/katello/authorization/content_view_version_import_history.rb +11 -0
- data/app/models/katello/concerns/content_facet_host_extensions.rb +1 -1
- data/app/models/katello/concerns/content_view_filter_rule_common.rb +2 -2
- data/app/models/katello/concerns/host_managed_extensions.rb +1 -32
- data/app/models/katello/concerns/hostgroup_extensions.rb +2 -9
- data/app/models/katello/concerns/http_proxy_extensions.rb +2 -4
- data/app/models/katello/concerns/location_extensions.rb +2 -25
- data/app/models/katello/concerns/operatingsystem_extensions.rb +0 -2
- data/app/models/katello/concerns/organization_extensions.rb +4 -18
- data/app/models/katello/concerns/redhat_extensions.rb +10 -18
- data/app/models/katello/concerns/smart_proxy_extensions.rb +6 -31
- data/app/models/katello/content_view.rb +17 -113
- data/app/models/katello/content_view_component.rb +5 -0
- data/app/models/katello/content_view_docker_filter_rule.rb +1 -0
- data/app/models/katello/content_view_package_filter_rule.rb +4 -0
- data/app/models/katello/content_view_package_group_filter.rb +1 -0
- data/app/models/katello/content_view_repository.rb +4 -5
- data/app/models/katello/content_view_version.rb +9 -33
- data/app/models/katello/content_view_version_export_history.rb +18 -4
- data/app/models/katello/content_view_version_import_history.rb +42 -0
- data/app/models/katello/erratum.rb +1 -1
- data/app/models/katello/events/delete_pool.rb +19 -0
- data/app/models/katello/glue/candlepin/environment.rb +7 -0
- data/app/models/katello/glue/candlepin/owner.rb +12 -1
- data/app/models/katello/glue/candlepin/pool.rb +42 -25
- data/app/models/katello/glue/provider.rb +3 -6
- data/app/models/katello/glue/pulp/repo.rb +19 -9
- data/app/models/katello/host/content_facet.rb +1 -0
- data/app/models/katello/host/subscription_facet.rb +3 -1
- data/app/models/katello/kt_environment.rb +0 -6
- data/app/models/katello/package_group.rb +4 -0
- data/app/models/katello/ping.rb +15 -4
- data/app/models/katello/pool.rb +9 -0
- data/app/models/katello/product.rb +0 -6
- data/app/models/katello/product_content.rb +3 -1
- data/app/models/katello/pulp_sync_status.rb +0 -10
- data/app/models/katello/repository.rb +20 -35
- data/app/models/katello/root_repository.rb +0 -5
- data/app/models/katello/subscription.rb +10 -0
- data/app/models/katello/sync_plan.rb +7 -0
- data/app/models/setting/content.rb +7 -8
- data/app/presenters/katello/content_view_version_compare_presenter.rb +2 -6
- data/app/presenters/katello/product_content_presenter.rb +3 -5
- data/app/services/cert/certs.rb +3 -7
- data/app/services/katello/applicability/applicable_content_helper.rb +1 -2
- data/app/services/katello/candlepin/event_handler.rb +22 -22
- data/app/services/katello/candlepin/message_handler.rb +24 -15
- data/app/services/katello/content_view_manager.rb +24 -0
- data/app/services/katello/event_monitor/poller_thread.rb +25 -20
- data/app/services/katello/managed_content_medium_provider.rb +4 -0
- data/app/services/katello/organization_creator.rb +120 -0
- data/app/services/katello/product_content_finder.rb +5 -1
- data/app/services/katello/pulp/pulp_content_unit.rb +6 -6
- data/app/services/katello/pulp/smart_proxy_repository.rb +2 -17
- data/app/services/katello/pulp3/api/ansible_collection.rb +14 -2
- data/app/services/katello/pulp3/api/apt.rb +1 -1
- data/app/services/katello/pulp3/api/content_guard.rb +6 -40
- data/app/services/katello/pulp3/api/core.rb +27 -2
- data/app/services/katello/pulp3/api/docker.rb +1 -1
- data/app/services/katello/pulp3/api/file.rb +5 -1
- data/app/services/katello/pulp3/api/yum.rb +9 -1
- data/app/services/katello/pulp3/content_view_version/export.rb +18 -40
- data/app/services/katello/pulp3/content_view_version/import.rb +75 -30
- data/app/services/katello/pulp3/content_view_version/import_gpg_keys.rb +32 -0
- data/app/services/katello/pulp3/content_view_version/import_validator.rb +53 -21
- data/app/services/katello/pulp3/content_view_version/importable_products.rb +47 -0
- data/app/services/katello/pulp3/content_view_version/importable_repositories.rb +52 -0
- data/app/services/katello/pulp3/content_view_version/metadata_generator.rb +99 -0
- data/app/services/katello/pulp3/pulp_content_unit.rb +1 -1
- data/app/services/katello/pulp3/repository/ansible_collection.rb +5 -1
- data/app/services/katello/pulp3/repository/apt.rb +2 -1
- data/app/services/katello/pulp3/repository/yum.rb +0 -16
- data/app/services/katello/pulp3/repository.rb +20 -1
- data/app/services/katello/pulp3/rpm.rb +5 -1
- data/app/services/katello/pulp3/task.rb +12 -5
- data/app/services/katello/pulp3/task_group.rb +10 -5
- data/app/services/katello/smart_proxy_helper.rb +1 -8
- data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb +0 -1
- data/app/services/katello/ui_notifications/system_error.rb +25 -0
- data/app/views/katello/api/v2/content_view_components/show.json.rabl +1 -1
- data/app/views/katello/api/v2/content_view_filters/show.json.rabl +0 -1
- data/app/views/katello/api/v2/{puppet_modules → content_view_version_import_histories}/index.json.rabl +1 -1
- data/app/views/katello/api/v2/content_view_version_import_histories/show.json.rabl +14 -0
- data/app/views/katello/api/v2/content_view_versions/base.json.rabl +2 -2
- data/app/views/katello/api/v2/content_view_versions/show.json.rabl +0 -7
- data/app/views/katello/api/v2/content_views/base.json.rabl +20 -9
- data/app/views/katello/api/v2/environments/show.json.rabl +0 -1
- data/app/views/katello/api/v2/package_groups/index.json.rabl +4 -0
- data/app/views/katello/api/v2/repositories/base.json.rabl +0 -1
- data/app/views/katello/api/v2/repositories/show.json.rabl +1 -1
- data/app/views/katello/api/v2/repository_sets/index.json.rabl +4 -1
- data/app/views/katello/api/v2/repository_sets/show.json.rabl +22 -0
- data/app/views/katello/api/v2/subscriptions/show.json.rabl +1 -1
- data/app/views/overrides/activation_keys/_host_media_type_select.html.erb +1 -1
- data/app/views/overrides/smart_proxies/_download_policy.erb +1 -1
- data/config/initializers/monkeys.rb +0 -1
- data/config/katello.yaml.example +0 -1
- data/config/routes/api/v2.rb +9 -21
- data/config/routes/overrides.rb +1 -2
- data/db/migrate/20140422000001_update_products_add_organization.rb +3 -2
- data/db/migrate/20160701180402_add_sortable_version_to_puppet_modules.rb +2 -0
- data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb +1 -1
- data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb +14 -20
- data/db/migrate/20210224160921_remove_disabled_products_from_sync_plans.rb +6 -0
- data/db/migrate/20210302165636_remove_katello_puppet_modules.rb +62 -0
- data/db/migrate/20210309160925_create_katello_content_view_version_import_histories.rb +13 -0
- data/db/migrate/20210318204533_add_import_type_to_import_histories.rb +8 -0
- data/db/migrate/20210319123300_add_foreign_keys_to_import_export_histories.rb +6 -0
- data/db/migrate/20210322142311_add_auth_url_token_to_root_repositories.rb +6 -0
- data/db/migrate/20210331180353_katello_pool_organization_id_not_nullable.rb +16 -0
- data/db/migrate/20210409033915_add_created_in_katello_to_taxonomy.rb +9 -0
- data/db/seeds.d/101-locations.rb +0 -3
- data/db/seeds.d/102-organizations.rb +1 -5
- data/db/seeds.d/109-katello-notification-blueprints.rb +12 -0
- data/db/seeds.d/111-upgrade_tasks.rb +3 -2
- data/engines/bastion/vendor/assets/javascripts/bastion/angular/angular.js +325 -156
- data/engines/bastion/vendor/assets/javascripts/bastion/angular-animate/angular-animate.js +3 -3
- data/engines/bastion/vendor/assets/javascripts/bastion/angular-resource/angular-resource.js +3 -3
- data/engines/bastion/vendor/assets/javascripts/bastion/angular-route/angular-route.js +3 -3
- data/engines/bastion/vendor/assets/javascripts/bastion/angular-sanitize/angular-sanitize.js +21 -43
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js +9 -10
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html +2 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html +11 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html +18 -11
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html +10 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-actions.controller.js +5 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-applicable.controller.js +7 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js +7 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html +7 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html +14 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js +0 -14
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js +9 -11
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html +2 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register.html +5 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-view.factory.js +0 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js +0 -56
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-available-content-views.html +0 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-content-views-list.html +0 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html +2 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html +0 -12
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-versions.html +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js +2 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-versions.module.js +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version.html +0 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js +0 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.module.js +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.routes.js +0 -11
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js +21 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html +9 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +71 -311
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/translations.js +0 -10
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/fenced-pages.service.js +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js +2 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +13 -15
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +21 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js +0 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html +0 -6
- data/engines/bastion_katello/lib/bastion_katello/engine.rb +3 -3
- data/lib/katello/engine.rb +16 -15
- data/lib/katello/middleware/organization_created_enforcer.rb +22 -0
- data/lib/katello/permission_creator.rb +12 -28
- data/lib/katello/permissions/host_permissions.rb +3 -2
- data/lib/katello/plugin.rb +6 -19
- data/lib/katello/repository_types/ansible_collection.rb +1 -1
- data/lib/katello/repository_types/deb.rb +1 -1
- data/lib/katello/repository_types/docker.rb +1 -1
- data/lib/katello/repository_types/file.rb +1 -1
- data/lib/katello/repository_types/yum.rb +1 -1
- data/lib/katello/tasks/clean_backend_objects.rake +25 -0
- data/lib/katello/tasks/jenkins.rake +6 -0
- data/lib/katello/tasks/receptor/extract_orgs.rake +1 -3
- data/lib/katello/tasks/reimport.rake +0 -1
- data/lib/katello/tasks/repository.rake +0 -30
- data/lib/katello/tasks/update_subscription_facet_backend_data.rake +3 -3
- data/lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake +2 -4
- data/lib/katello/tasks/upgrades/4.1/fix_invalid_pools.rake +62 -0
- data/lib/katello/tasks/upgrades/4.1/sync_noarch_content.rake +15 -0
- data/lib/katello/version.rb +1 -1
- data/lib/katello.rb +1 -1
- data/locale/action_names.rb +65 -63
- data/locale/bn/katello.edit.po +1357 -1606
- data/locale/bn/katello.po +465 -744
- data/locale/cs/katello.edit.po +1213 -1087
- data/locale/cs/katello.po +307 -219
- data/locale/de/katello.edit.po +1498 -1520
- data/locale/de/katello.po +589 -625
- data/locale/en/katello.edit.po +1198 -1074
- data/locale/en/katello.po +304 -213
- data/locale/es/katello.edit.po +2344 -2304
- data/locale/es/katello.po +1407 -1407
- data/locale/fr/katello.edit.po +2720 -2642
- data/locale/fr/katello.po +1703 -1750
- data/locale/gu/katello.edit.po +1546 -1797
- data/locale/gu/katello.po +654 -935
- data/locale/hi/katello.edit.po +1545 -1793
- data/locale/hi/katello.po +653 -931
- data/locale/it/katello.edit.po +1323 -1310
- data/locale/it/katello.po +407 -409
- data/locale/ja/katello.edit.po +2645 -2557
- data/locale/ja/katello.po +1646 -1664
- data/locale/katello.pot +1435 -1289
- data/locale/kn/katello.edit.po +1546 -1795
- data/locale/kn/katello.po +654 -933
- data/locale/ko/katello.edit.po +1464 -1449
- data/locale/ko/katello.po +554 -554
- data/locale/mr/katello.edit.po +1545 -1758
- data/locale/mr/katello.po +653 -896
- data/locale/or/katello.edit.po +1546 -1795
- data/locale/or/katello.po +654 -933
- data/locale/pa/katello.edit.po +1541 -1775
- data/locale/pa/katello.po +649 -913
- data/locale/pt/katello.edit.po +1289 -1255
- data/locale/pt/katello.po +398 -394
- data/locale/pt_BR/katello.edit.po +2370 -2315
- data/locale/pt_BR/katello.po +1435 -1421
- data/locale/ru/katello.edit.po +1611 -1608
- data/locale/ru/katello.po +704 -716
- data/locale/ta/katello.edit.po +1358 -1605
- data/locale/ta/katello.po +465 -742
- data/locale/te/katello.edit.po +1545 -1792
- data/locale/te/katello.po +653 -930
- data/locale/zh_CN/katello.edit.po +3052 -2930
- data/locale/zh_CN/katello.po +2055 -2039
- data/locale/zh_TW/katello.edit.po +1571 -1669
- data/locale/zh_TW/katello.po +649 -777
- data/package.json +2 -2
- data/webpack/{scenes/ContentViews/Details/Repositories/RepoAddedStatus.js → components/AddedStatusLabel.js} +5 -5
- data/webpack/components/RoutedTabs/RoutedTabs.js +91 -0
- data/webpack/components/RoutedTabs/__tests__/RoutedTabs.test.js +32 -0
- data/webpack/components/RoutedTabs/index.js +4 -0
- data/webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageConstants.js +2 -0
- data/webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageHelpers.js +21 -0
- data/webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageSelectors.js +21 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/ActivationKeys.test.js +18 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/Force.test.js +9 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/IgnoreSubmanErrors.test.js +9 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/LifeCycleEnvironment.test.js +11 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap +58 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/Force.test.js.snap +25 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/IgnoreSubmanErrors.test.js.snap +25 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/LifeCycleEnvironment.test.js.snap +27 -0
- data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js +99 -0
- data/webpack/components/extensions/RegistrationCommands/fields/Force.js +38 -0
- data/webpack/components/extensions/RegistrationCommands/fields/IgnoreSubmanErrors.js +38 -0
- data/webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js +56 -0
- data/webpack/components/extensions/RegistrationCommands/index.js +81 -0
- data/webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js +23 -24
- data/webpack/components/pf3Table/formatters/__tests__/__snapshots__/EntitlementsInlineEditFormatter.test.js.snap +3 -1
- data/webpack/components/pf3Table/formatters/entitlementsValueFormatter.js +16 -0
- data/webpack/containers/Application/overrides.scss +3 -0
- data/webpack/fills_index.js +3 -0
- data/webpack/redux/reducers/RedHatRepositories/enabled.fixtures.js +0 -2
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +8 -1
- data/webpack/scenes/ContentViews/Copy/__tests__/contentViewCopyResult.fixtures.json +1 -3
- data/webpack/scenes/ContentViews/Create/__tests__/contentViewCreateResult.fixtures.json +1 -3
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentEnvironments.js +28 -0
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentVersion.js +45 -0
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js +124 -0
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.fixtures.json +161 -0
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js +163 -0
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/unpublishedCVComponents.fixtures.json +64 -0
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +67 -7
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +61 -4
- data/webpack/scenes/ContentViews/Details/ContentViewDetails.js +34 -11
- data/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js +33 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js +117 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js +115 -0
- data/webpack/scenes/ContentViews/Details/Filters/ContentType.js +7 -10
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetails.js +49 -0
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetailsHeader.js +56 -0
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +3 -17
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js +116 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/allFilterPackageGroups.fixtures.json +69 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetail.fixtures.json +103 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js +116 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvPackageFilterDetail.fixtures.json +147 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvPackageFilterRules.fixtures.json +30 -0
- data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js +136 -0
- data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.fixtures.json +370 -0
- data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js +94 -0
- data/webpack/scenes/ContentViews/Details/Repositories/ContentCounts.js +0 -1
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +106 -13
- data/webpack/scenes/ContentViews/Details/Repositories/LastSync.js +11 -5
- data/webpack/scenes/ContentViews/Details/Repositories/RepoIcon.js +5 -1
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +138 -0
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json +0 -2
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.test.js +1 -1
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewRepoAdd.fixture.json +57 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionContent.js +73 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionEnvironments.js +31 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionErrata.js +64 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionErrata.scss +8 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionPackages.js +0 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js +105 -0
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.fixtures.json +728 -0
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +154 -0
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/emptyCVVersion.fixtures.json +13 -0
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js +3 -1
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json +0 -2
- data/webpack/scenes/ContentViews/Table/ContentViewVersionCell.js +33 -0
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +17 -22
- data/webpack/scenes/ContentViews/Table/tableDataGenerator.js +51 -102
- data/webpack/scenes/ContentViews/__tests__/basicContentViews.fixtures.js +5 -3
- data/webpack/scenes/ContentViews/__tests__/contentViewList.fixtures.json +30 -5
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +95 -0
- data/webpack/scenes/ContentViews/components/ContentViewIcon.js +11 -5
- data/webpack/scenes/ContentViews/components/EnvironmentLabels.js +16 -0
- data/webpack/scenes/ContentViews/components/IconWithCount.js +1 -1
- data/webpack/scenes/ContentViews/components/InactiveText.js +15 -0
- data/webpack/scenes/ContentViews/expansions/DetailsExpansion.js +19 -1
- data/webpack/scenes/Subscriptions/Details/SubscriptionPurposeAttributes.js +1 -1
- data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailInfo.test.js.snap +1 -1
- data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap +3 -3
- data/webpack/scenes/Subscriptions/Details/__tests__/subscriptionDetails.fixtures.js +1 -1
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js +17 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js +2 -1
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.test.js +1 -1
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap +144 -0
- data/webpack/scenes/Tasks/helpers.js +2 -2
- data/webpack/test-utils/react-testing-lib-wrapper.js +11 -3
- data/webpack/utils/__tests__/useParamsWithHash.test.js +22 -0
- data/webpack/utils/helpers.js +2 -0
- data/webpack/utils/paramsFromHash.js +16 -0
- data/webpack/utils/useUrlParams.js +14 -0
- metadata +122 -206
- data/app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb +0 -82
- data/app/controllers/katello/api/v2/puppet_modules_controller.rb +0 -19
- data/app/controllers/katello/concerns/registration_controller_extensions.rb +0 -16
- data/app/helpers/katello/concerns/hosts_and_hostgroups_helper_extensions.rb +0 -20
- data/app/lib/actions/candlepin/owner/create.rb +0 -16
- data/app/lib/actions/katello/content_view_puppet_environment/clear.rb +0 -11
- data/app/lib/actions/katello/content_view_puppet_environment/clone.rb +0 -78
- data/app/lib/actions/katello/content_view_puppet_environment/clone_content_for_version.rb +0 -20
- data/app/lib/actions/katello/content_view_puppet_environment/create.rb +0 -34
- data/app/lib/actions/katello/content_view_puppet_environment/create_for_version.rb +0 -23
- data/app/lib/actions/katello/content_view_puppet_environment/destroy.rb +0 -28
- data/app/lib/actions/katello/content_view_puppet_module/destroy.rb +0 -46
- data/app/lib/actions/katello/environment/library_create.rb +0 -35
- data/app/lib/actions/katello/organization/create.rb +0 -38
- data/app/lib/actions/pulp/content_view_puppet_environment/copy_contents.rb +0 -36
- data/app/lib/actions/pulp/content_view_puppet_environment/index_content.rb +0 -19
- data/app/lib/actions/pulp/repository/presenters/puppet_presenter.rb +0 -54
- data/app/lib/actions/pulp3/content_migration.rb +0 -31
- data/app/lib/actions/pulp3/content_migration_presenter.rb +0 -59
- data/app/lib/actions/pulp3/content_migration_reset.rb +0 -22
- data/app/lib/katello/foreman.rb +0 -32
- data/app/lib/katello/mapping.rb +0 -31
- data/app/lib/katello/util/hostgroup_facets_helper.rb +0 -126
- data/app/lib/katello/validators/content_view_puppet_module_validator.rb +0 -32
- data/app/models/katello/concerns/environment_extensions.rb +0 -74
- data/app/models/katello/content_view_puppet_environment.rb +0 -116
- data/app/models/katello/content_view_puppet_environment_puppet_module.rb +0 -11
- data/app/models/katello/content_view_puppet_module.rb +0 -63
- data/app/models/katello/puppet_module.rb +0 -77
- data/app/models/katello/repository_puppet_module.rb +0 -7
- data/app/services/katello/pulp/puppet_module.rb +0 -21
- data/app/services/katello/pulp/repository/puppet.rb +0 -68
- data/app/services/katello/pulp3/migration.rb +0 -329
- data/app/services/katello/pulp3/migration_plan.rb +0 -178
- data/app/services/katello/pulp3/migration_switchover.rb +0 -126
- data/app/services/katello/puppet_class_importer_extensions.rb +0 -32
- data/app/views/foreman/hosts/_registration.html.erb +0 -12
- data/app/views/katello/api/v2/activation_keys/product_content.json.rabl +0 -30
- data/app/views/katello/api/v2/content_view_puppet_modules/create.json.rabl +0 -3
- data/app/views/katello/api/v2/content_view_puppet_modules/index.json.rabl +0 -7
- data/app/views/katello/api/v2/content_view_puppet_modules/show.json.rabl +0 -9
- data/app/views/katello/api/v2/content_views/puppet_modules.json.rabl +0 -7
- data/app/views/katello/api/v2/host_subscriptions/content_override.json.rabl +0 -3
- data/app/views/katello/api/v2/host_subscriptions/product_content.json.rabl +0 -29
- data/app/views/katello/api/v2/puppet_modules/backend.json.rabl +0 -7
- data/app/views/katello/api/v2/puppet_modules/base.json.rabl +0 -9
- data/app/views/katello/api/v2/puppet_modules/compare.json.rabl +0 -10
- data/app/views/katello/api/v2/puppet_modules/name.json.rabl +0 -3
- data/app/views/katello/api/v2/puppet_modules/names.json.rabl +0 -7
- data/app/views/katello/api/v2/puppet_modules/show.json.rabl +0 -4
- data/db/migrate/20210512192745_fix_red_hat_root_repository_arch.rb +0 -11
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-client.directive.js +0 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-os-client.directive.js +0 -17
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register.controller.js +0 -44
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html +0 -28
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-deb-client.html +0 -38
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-oracle-client.html +0 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-sles-client.html +0 -28
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-puppet-modules.controller.js +0 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-names.controller.js +0 -45
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-versions.controller.js +0 -61
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module.factory.js +0 -23
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-modules.controller.js +0 -74
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-names.html +0 -57
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-versions.html +0 -64
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-modules.html +0 -54
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-puppet-modules.html +0 -19
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-puppet-modules.html +0 -25
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/de.po +0 -6903
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/es.po +0 -7094
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/fr.po +0 -7303
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/it.po +0 -6895
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ja.po +0 -6865
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ko.po +0 -6720
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/pt_BR.po +0 -7077
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ru.po +0 -6832
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/zh_CN.po +0 -6766
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/zh_TW.po +0 -6703
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-puppet-modules.html +0 -66
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/puppet-module-content-views.controller.js +0 -44
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/puppet-module-repositories.controller.js +0 -36
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/puppet-module.controller.js +0 -34
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/views/puppet-module-content-views.html +0 -41
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/views/puppet-module-info.html +0 -32
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/views/puppet-module-repositories.html +0 -52
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/views/puppet-module.html +0 -37
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-module.factory.js +0 -28
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-modules.controller.js +0 -35
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-modules.module.js +0 -20
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-modules.routes.js +0 -71
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/views/puppet-modules.html +0 -47
- data/lib/katello/repository_types/puppet.rb +0 -5
- data/lib/katello/tasks/fix_hostgroup_facets.rake +0 -8
- data/lib/katello/tasks/pulp3_content_switchover.rake +0 -32
- data/lib/katello/tasks/pulp3_migration.rake +0 -41
- data/lib/katello/tasks/pulp3_migration_abort.rake +0 -22
- data/lib/katello/tasks/pulp3_migration_reset.rake +0 -26
- data/lib/katello/tasks/pulp3_migration_stats.rake +0 -41
- data/lib/katello/tasks/pulp3_post_migration_check.rake +0 -51
- data/lib/monkeys/passenger_tee_input.rb +0 -20
- data/locale/bn/LC_MESSAGES/katello.mo +0 -0
- data/locale/cs/LC_MESSAGES/katello.mo +0 -0
- data/locale/de/LC_MESSAGES/katello.mo +0 -0
- data/locale/en/LC_MESSAGES/katello.mo +0 -0
- data/locale/es/LC_MESSAGES/katello.mo +0 -0
- data/locale/fr/LC_MESSAGES/katello.mo +0 -0
- data/locale/gu/LC_MESSAGES/katello.mo +0 -0
- data/locale/hi/LC_MESSAGES/katello.mo +0 -0
- data/locale/it/LC_MESSAGES/katello.mo +0 -0
- data/locale/ja/LC_MESSAGES/katello.mo +0 -0
- data/locale/kn/LC_MESSAGES/katello.mo +0 -0
- data/locale/ko/LC_MESSAGES/katello.mo +0 -0
- data/locale/mr/LC_MESSAGES/katello.mo +0 -0
- data/locale/or/LC_MESSAGES/katello.mo +0 -0
- data/locale/pa/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt_BR/LC_MESSAGES/katello.mo +0 -0
- data/locale/ru/LC_MESSAGES/katello.mo +0 -0
- data/locale/ta/LC_MESSAGES/katello.mo +0 -0
- data/locale/te/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_CN/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_TW/LC_MESSAGES/katello.mo +0 -0
- data/webpack/components/TabWrapper/TabWrapper.js +0 -26
- data/webpack/components/TabWrapper/index.js +0 -3
- data/webpack/components/TabbedView/TabbedView.js +0 -38
- data/webpack/components/TabbedView/TabbedView.scss +0 -3
- data/webpack/components/TabbedView/index.js +0 -3
- data/webpack/scenes/ContentViews/expansions/EnvironmentsExpansion.js +0 -19
- data/webpack/scenes/ContentViews/expansions/VersionsExpansion.js +0 -11
@@ -1,8 +1,16 @@
|
|
1
1
|
<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
|
2
2
|
|
3
|
-
|
4
3
|
<h3 translate>Applicable Packages</h3>
|
5
|
-
<div data-extend-template="common/views/katello-agent-notice.html"></div>
|
4
|
+
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
5
|
+
|
6
|
+
<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
|
7
|
+
<p bst-alert="warning" ng-hide="hostToolingEnabled">
|
8
|
+
<span translate>
|
9
|
+
Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
|
10
|
+
</span>
|
11
|
+
</p>
|
12
|
+
</section>
|
13
|
+
|
6
14
|
<div data-extend-template="layouts/partials/table.html">
|
7
15
|
|
8
16
|
<span data-block="no-rows-message" translate>
|
@@ -21,18 +29,18 @@
|
|
21
29
|
<button class="btn btn-primary" type="button"
|
22
30
|
ng-click="performDefaultUpdateAction()"
|
23
31
|
ng-hide="denied('edit_hosts', host)"
|
24
|
-
ng-disabled="working || table.numSelected === 0"
|
32
|
+
ng-disabled="working || table.numSelected === 0 || !hostToolingEnabled"
|
25
33
|
translate>
|
26
34
|
Upgrade Selected
|
27
35
|
</button>
|
28
36
|
<button uib-dropdown-toggle class="btn btn-default"
|
29
|
-
ng-hide="!remoteExecutionPresent || denied('edit_hosts',
|
37
|
+
ng-hide="!remoteExecutionPresent || denied('edit_hosts', host)"
|
30
38
|
ng-disabled="working || table.numSelected === 0"
|
31
39
|
type="button" id="use-remote-execution">
|
32
40
|
<span class="caret"></span>
|
33
41
|
</button>
|
34
42
|
<ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
|
35
|
-
<li role="presentation"><a ng-click="performViaKatelloAgent('packageUpdate', getKatelloAgentCommand())" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
|
43
|
+
<li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('packageUpdate', getKatelloAgentCommand())" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
|
36
44
|
<li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
|
37
45
|
<li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
|
38
46
|
</ul>
|
@@ -41,7 +49,7 @@
|
|
41
49
|
<button class="btn btn-default"
|
42
50
|
type="button"
|
43
51
|
translate
|
44
|
-
ng-disabled="working"
|
52
|
+
ng-disabled="working || !katelloAgentPresent"
|
45
53
|
ng-click="updateAll()">
|
46
54
|
Update All Packages
|
47
55
|
</button>
|
@@ -2,13 +2,13 @@
|
|
2
2
|
|
3
3
|
<h3 translate>Installed Packages</h3>
|
4
4
|
|
5
|
-
<div data-extend-template="common/views/katello-agent-notice.html"></div>
|
5
|
+
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
6
6
|
|
7
7
|
<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
|
8
|
-
<p bst-alert="
|
8
|
+
<p bst-alert="warning" ng-hide="hostToolingEnabled">
|
9
9
|
<span translate>
|
10
|
-
|
11
|
-
|
10
|
+
Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
|
11
|
+
</span>
|
12
12
|
</p>
|
13
13
|
</section>
|
14
14
|
|
@@ -24,7 +24,7 @@
|
|
24
24
|
<div data-block="list-actions" bst-feature-flag="remote_actions">
|
25
25
|
<button class="btn btn-default" type="button"
|
26
26
|
ng-hide="denied('edit_hosts', host)"
|
27
|
-
ng-disabled="working || table.numSelected === 0"
|
27
|
+
ng-disabled="working || table.numSelected === 0 || !hostToolingEnabled"
|
28
28
|
ng-click="removeSelectedPackages()">
|
29
29
|
<span translate>Remove Selected</span>
|
30
30
|
</button>
|
@@ -23,20 +23,6 @@ angular.module('Bastion.content-hosts').config(['$stateProvider', function ($sta
|
|
23
23
|
}
|
24
24
|
});
|
25
25
|
|
26
|
-
$stateProvider.state('content-hosts.register', {
|
27
|
-
url: '/register',
|
28
|
-
permission: 'view_hosts',
|
29
|
-
views: {
|
30
|
-
'@': {
|
31
|
-
controller: 'ContentHostRegisterController',
|
32
|
-
templateUrl: 'content-hosts/views/register.html'
|
33
|
-
}
|
34
|
-
},
|
35
|
-
ncyBreadcrumb: {
|
36
|
-
label: "{{ 'Register a Host' | translate }}"
|
37
|
-
}
|
38
|
-
});
|
39
|
-
|
40
26
|
$stateProvider.state('content-hosts.bulk-task', {
|
41
27
|
url: '/bulk-tasks/:taskId',
|
42
28
|
permission: ['view_hosts'],
|
@@ -6,30 +6,28 @@
|
|
6
6
|
* @requires translate
|
7
7
|
* @requires Nutupane
|
8
8
|
* @requires HostSubscription
|
9
|
+
* @requires RepositorySet
|
9
10
|
* @requires ContentOverrideHelper
|
10
11
|
* @requires Notification
|
11
|
-
* @requires CurrentOrganization
|
12
12
|
*
|
13
13
|
* @description
|
14
14
|
* Provides the functionality for the content-host products action pane.
|
15
15
|
*/
|
16
16
|
angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsController',
|
17
|
-
['$scope', 'translate', 'Nutupane', 'HostSubscription', '
|
18
|
-
function ($scope, translate, Nutupane, HostSubscription, ContentOverrideHelper, Notification
|
17
|
+
['$scope', 'translate', 'Nutupane', 'HostSubscription', 'RepositorySet', 'ContentOverrideHelper', 'Notification',
|
18
|
+
function ($scope, translate, Nutupane, HostSubscription, RepositorySet, ContentOverrideHelper, Notification) {
|
19
19
|
var params, saveContentOverride, success, error;
|
20
20
|
|
21
21
|
params = {
|
22
|
-
|
23
|
-
'
|
24
|
-
|
25
|
-
'
|
26
|
-
'include_available_content': true,
|
27
|
-
'content_access_mode_all': $scope.simpleContentAccessEnabled
|
22
|
+
'host_id': $scope.$stateParams.hostId,
|
23
|
+
'content_access_mode_all': $scope.simpleContentAccessEnabled,
|
24
|
+
'sort_order': 'ASC',
|
25
|
+
'paged': true
|
28
26
|
};
|
29
27
|
|
30
|
-
$scope.
|
31
|
-
$scope.nutupane = new Nutupane(HostSubscription, params, 'repositorySets');
|
28
|
+
$scope.nutupane = new Nutupane(RepositorySet, params);
|
32
29
|
$scope.table = $scope.nutupane.table;
|
30
|
+
$scope.nutupane.primaryOnly = true;
|
33
31
|
|
34
32
|
$scope.contentAccessModes = {
|
35
33
|
contentAccessModeAll: $scope.simpleContentAccessEnabled,
|
@@ -51,10 +51,10 @@
|
|
51
51
|
</button>
|
52
52
|
</dd>
|
53
53
|
|
54
|
-
<dt bst-feature-flag="remote_actions">
|
54
|
+
<dt bst-feature-flag="remote_actions" ng-show="katelloAgentPresent">
|
55
55
|
<span translate>Katello Agent</span>
|
56
56
|
</dt>
|
57
|
-
<dd bst-feature-flag="remote_actions">
|
57
|
+
<dd bst-feature-flag="remote_actions" ng-show="katelloAgentPresent">
|
58
58
|
<span ng-show="host.content_facet_attributes.katello_agent_installed">
|
59
59
|
<span class="{{ getHostStatusIcon(0) }}"></span>
|
60
60
|
<span translate>Installed</span>
|
@@ -15,12 +15,6 @@
|
|
15
15
|
</div>
|
16
16
|
|
17
17
|
<div data-extend-template="layouts/partials/table.html">
|
18
|
-
<div data-block="search">
|
19
|
-
<input type="text" class="form-control" stop-event="click"
|
20
|
-
placeholder="{{ 'Filter...' | translate }}"
|
21
|
-
ng-model="repositorySetFilter"/>
|
22
|
-
</div>
|
23
|
-
|
24
18
|
<div data-block="filters">
|
25
19
|
<label class="checkbox-inline" title="{{ 'Show all Repository Sets in Organization' | translate }}" ng-if="!simpleContentAccessEnabled">
|
26
20
|
<input type="checkbox" ng-model="contentAccessModes.contentAccessModeAll" ng-change="toggleFilters()"/>
|
@@ -80,10 +74,10 @@
|
|
80
74
|
<td bst-table-cell>{{ productRepoSet.content.name }}</td>
|
81
75
|
<td bst-table-cell>
|
82
76
|
<a ui-sref="product.info({productId: productRepoSet.product.id})">
|
83
|
-
{{ productRepoSet.
|
77
|
+
{{ productRepoSet.name }}
|
84
78
|
</a>
|
85
79
|
</td>
|
86
|
-
<td bst-table-cell>{{ productRepoSet.
|
80
|
+
<td bst-table-cell>{{ productRepoSet.contentUrl }}</td>
|
87
81
|
<td bst-table-cell>{{ productRepoSet | repositorySetsEnabled }}</td>
|
88
82
|
</tr>
|
89
83
|
</tbody>
|
@@ -10,12 +10,9 @@
|
|
10
10
|
<a href="/hosts/content_hosts.csv?{{csvQuery()}}" class="btn btn-default" target="_self">
|
11
11
|
<span translate>Export</span>
|
12
12
|
</a>
|
13
|
-
<
|
14
|
-
|
15
|
-
|
16
|
-
ui-sref="content-hosts.register">
|
17
|
-
<span translate>Register Content Host</span>
|
18
|
-
</button>
|
13
|
+
<a class="btn btn-default" href="/hosts/register" ng-show="permitted('create_hosts')" translate>
|
14
|
+
Register Content Host
|
15
|
+
</a>
|
19
16
|
|
20
17
|
<span select-action-dropdown>
|
21
18
|
<ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
|
@@ -8,6 +8,11 @@
|
|
8
8
|
|
9
9
|
<div data-block="content">
|
10
10
|
<p translate>To register a content host to this server, follow these steps.</p>
|
11
|
+
<p bst-alert="info" >
|
12
|
+
<span translate>
|
13
|
+
These instructions will be removed in a future release. NEW: To register a content host without following these manual steps, see <a href="https://{{ katelloHostname }}/hosts/register">Register Host</a>
|
14
|
+
</span>
|
15
|
+
</p>
|
11
16
|
<ol>
|
12
17
|
<li>
|
13
18
|
<p>Select an Operating System:</p>
|
@@ -33,12 +33,6 @@ angular.module('Bastion.content-views').factory('ContentView',
|
|
33
33
|
var contentView = angular.fromJson(data);
|
34
34
|
return {results: contentView.content_view_components};
|
35
35
|
}},
|
36
|
-
availablePuppetModules: {method: 'GET', params: {action: 'available_puppet_modules'},
|
37
|
-
transformResponse: function (data) {
|
38
|
-
return angular.fromJson(data);
|
39
|
-
}
|
40
|
-
},
|
41
|
-
availablePuppetModuleNames: {method: 'GET', params: {action: 'available_puppet_module_names'}},
|
42
36
|
autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
|
43
37
|
}
|
44
38
|
);
|
@@ -130,16 +130,6 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
|
|
130
130
|
parent: 'content-view.version.details'
|
131
131
|
}
|
132
132
|
})
|
133
|
-
.state('content-view.version.puppet-modules', {
|
134
|
-
url: '/puppet_modules',
|
135
|
-
permission: 'view_content_views',
|
136
|
-
controller: 'ContentViewVersionContentController',
|
137
|
-
templateUrl: 'content-views/versions/views/content-view-version-puppet-modules.html',
|
138
|
-
ncyBreadcrumb: {
|
139
|
-
label: '{{ "Puppet Modules" | translate }}',
|
140
|
-
parent: 'content-view.version.details'
|
141
|
-
}
|
142
|
-
})
|
143
133
|
.state('content-view.version.ostree-branches', {
|
144
134
|
url: '/ostree_branches',
|
145
135
|
permission: 'view_content_views',
|
@@ -408,52 +398,6 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
|
|
408
398
|
parent: 'content-view.info'
|
409
399
|
}
|
410
400
|
})
|
411
|
-
.state('content-view.puppet-modules', {
|
412
|
-
abstract: true,
|
413
|
-
template: '<div ui-view></div>'
|
414
|
-
})
|
415
|
-
.state('content-view.puppet-modules.list', {
|
416
|
-
url: '/puppet_modules',
|
417
|
-
permission: 'view_content_views',
|
418
|
-
controller: 'ContentViewPuppetModulesController',
|
419
|
-
templateUrl: 'content-views/details/puppet-modules/views/content-view-puppet-modules.html',
|
420
|
-
ncyBreadcrumb: {
|
421
|
-
label: '{{ "Puppet Modules" | translate }}',
|
422
|
-
parent: 'content-view.info'
|
423
|
-
}
|
424
|
-
})
|
425
|
-
.state('content-view.puppet-modules.names', {
|
426
|
-
url: '/puppet_modules/names',
|
427
|
-
permission: 'edit_content_views',
|
428
|
-
controller: 'ContentViewPuppetModuleNamesController',
|
429
|
-
templateUrl: 'content-views/details/puppet-modules/views/content-view-puppet-module-names.html',
|
430
|
-
ncyBreadcrumb: {
|
431
|
-
label: '{{ "Add Puppet Module" | translate }}',
|
432
|
-
parent: 'content-view.puppet-modules.list'
|
433
|
-
}
|
434
|
-
})
|
435
|
-
.state('content-view.puppet-modules.versions', {
|
436
|
-
url: '/puppet_modules/:moduleName/versions',
|
437
|
-
permission: 'edit_content_views',
|
438
|
-
controller: 'ContentViewPuppetModuleVersionsController',
|
439
|
-
templateUrl: 'content-views/details/puppet-modules/views/content-view-puppet-module-versions.html',
|
440
|
-
ncyBreadcrumb: {
|
441
|
-
label: '{{ "Version for Module:" | translate }} {{ }}',
|
442
|
-
parent: 'content-view.puppet-modules.names'
|
443
|
-
}
|
444
|
-
})
|
445
|
-
// Necessary until ui-router supports optional parameters, see https://github.com/angular-ui/ui-router/issues/108
|
446
|
-
.state('content-view.puppet-modules.versionsForModule', {
|
447
|
-
collapsed: true,
|
448
|
-
url: '/puppet_modules/:moduleName/versions/:moduleId',
|
449
|
-
permission: 'edit_content_views',
|
450
|
-
controller: 'ContentViewPuppetModuleVersionsController',
|
451
|
-
templateUrl: 'content-views/details/puppet-modules/views/content-view-puppet-module-versions.html',
|
452
|
-
ncyBreadcrumb: {
|
453
|
-
label: '{{ "Versions for Module" | translate }}',
|
454
|
-
parent: 'content-view.puppet-modules.versions'
|
455
|
-
}
|
456
|
-
})
|
457
401
|
.state('content-view.history', {
|
458
402
|
url: '/history',
|
459
403
|
permission: 'view_content_views',
|
@@ -72,11 +72,6 @@
|
|
72
72
|
{{ componentContentView.repositories.length || 0 }} Repositories
|
73
73
|
</a>
|
74
74
|
</div>
|
75
|
-
<div>
|
76
|
-
<a ui-sref="content-view.puppet-modules.list({contentViewId: componentContentView.id})" translate>
|
77
|
-
{{ componentContentView.puppet_modules.length || 0 }} Puppet Modules
|
78
|
-
</a>
|
79
|
-
</div>
|
80
75
|
</td>
|
81
76
|
</tr>
|
82
77
|
</tbody>
|
@@ -71,11 +71,6 @@
|
|
71
71
|
{{ contentViewComponent.content_view_version.repositories.length || 0 }} Repositories
|
72
72
|
</a>
|
73
73
|
</div>
|
74
|
-
<div>
|
75
|
-
<a ui-sref="content-view.puppet-modules.list({contentViewId: contentViewComponent.content_view.id})" translate>
|
76
|
-
{{ contentViewComponent.content_view_version.puppet_module_count || 0 }} Puppet Modules
|
77
|
-
</a>
|
78
|
-
</div>
|
79
74
|
</td>
|
80
75
|
</tr>
|
81
76
|
</tbody>
|
@@ -13,7 +13,7 @@
|
|
13
13
|
</div>
|
14
14
|
|
15
15
|
<nav data-block="item-actions">
|
16
|
-
<button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only"
|
16
|
+
<button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only"
|
17
17
|
ui-sref="content-view.publish">
|
18
18
|
<span translate>Publish New Version</span>
|
19
19
|
</button>
|
@@ -61,7 +61,7 @@
|
|
61
61
|
|
62
62
|
<li uib-dropdown
|
63
63
|
ng-class="{active: stateIncludes('content-view.repositories.yum') || stateIncludes('content-view.yum.filters')}"
|
64
|
-
ng-hide="contentView.composite || !repositoryTypeEnabled('yum')">
|
64
|
+
ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('yum')">
|
65
65
|
|
66
66
|
<a uib-dropdown-toggle>
|
67
67
|
<span translate>Yum Content</span>
|
@@ -95,13 +95,6 @@
|
|
95
95
|
</a>
|
96
96
|
</li>
|
97
97
|
|
98
|
-
<li ng-class="{active: stateIncludes('content-view.puppet-modules')}"
|
99
|
-
ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('puppet')">
|
100
|
-
<a ui-sref="content-view.puppet-modules.list" translate>
|
101
|
-
Puppet Modules
|
102
|
-
</a>
|
103
|
-
</li>
|
104
|
-
|
105
98
|
<li uib-dropdown
|
106
99
|
ng-class="{active: stateIncludes('content-view.repositories.docker') || stateIncludes('content-view.docker.filters')}"
|
107
100
|
ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('docker')">
|
@@ -30,18 +30,6 @@
|
|
30
30
|
<dd ng-hide="contentView.import_only" translate>No</dd>
|
31
31
|
</div>
|
32
32
|
|
33
|
-
<dt translate>Force Puppet Environment</dt>
|
34
|
-
<dd>
|
35
|
-
<div bst-edit-checkbox="contentView.force_puppet_environment"
|
36
|
-
formatter="booleanToYesNo"
|
37
|
-
on-save="save(contentView)"
|
38
|
-
readonly="denied('edit_content_views', contentView)">
|
39
|
-
</div>
|
40
|
-
<p class="help-text" translate>
|
41
|
-
With this option selected, a puppet environment will be created during publish and promote even if no puppet modules have been added to the Content View
|
42
|
-
</p>
|
43
|
-
</dd>
|
44
|
-
|
45
33
|
<div ng-if="contentView.composite">
|
46
34
|
<dt translate>Auto Publish</dt>
|
47
35
|
<dd>
|
@@ -65,9 +65,6 @@
|
|
65
65
|
<div translate ng-if="version.module_stream_count && version.module_stream_count > 0">
|
66
66
|
{{ version.module_stream_count }} Module Streams
|
67
67
|
</div>
|
68
|
-
<div translate ng-if="version.puppet_module_count && version.puppet_module_count > 0">
|
69
|
-
{{ version.puppet_module_count }} Puppet Modules
|
70
|
-
</div>
|
71
68
|
<div translate ng-if="version.docker_manifest_count && version.docker_manifest_count > 0">
|
72
69
|
{{ version.docker_manifest_count }} Container Image Manifests
|
73
70
|
</div>
|
@@ -10,7 +10,7 @@
|
|
10
10
|
* ui-router state.
|
11
11
|
*/
|
12
12
|
function ContentViewVersionContentController($scope, translate, Nutupane, Package, Erratum,
|
13
|
-
PackageGroup,
|
13
|
+
PackageGroup, OstreeBranch, ModuleStream, Deb, Repository,
|
14
14
|
ContentViewVersion) {
|
15
15
|
var nutupane, contentTypes, currentState, params;
|
16
16
|
|
@@ -52,10 +52,6 @@
|
|
52
52
|
type: Erratum,
|
53
53
|
repositoryType: 'yum'
|
54
54
|
},
|
55
|
-
'puppet-modules': {
|
56
|
-
type: PuppetModule,
|
57
|
-
repositoryType: 'puppet'
|
58
|
-
},
|
59
55
|
'ostree-branches': {
|
60
56
|
type: OstreeBranch,
|
61
57
|
repositoryType: 'ostree',
|
@@ -147,6 +143,6 @@
|
|
147
143
|
.controller('ContentViewVersionContentController', ContentViewVersionContentController);
|
148
144
|
|
149
145
|
ContentViewVersionContentController.$inject = ['$scope', 'translate', 'Nutupane', 'Package', 'Erratum',
|
150
|
-
'PackageGroup', '
|
146
|
+
'PackageGroup', 'OstreeBranch', 'ModuleStream', 'Deb', 'Repository', 'ContentViewVersion'];
|
151
147
|
|
152
148
|
})();
|
@@ -57,13 +57,6 @@
|
|
57
57
|
</a>
|
58
58
|
</li>
|
59
59
|
|
60
|
-
<li ng-class="{active: isState('content-view.version.puppet-modules')}"
|
61
|
-
ng-show="version.puppet_module_count !== 0">
|
62
|
-
<a ui-sref="content-view.version.puppet-modules({versionId: version.id})">
|
63
|
-
<span translate>Puppet Modules</span>
|
64
|
-
</a>
|
65
|
-
</li>
|
66
|
-
|
67
60
|
<li ng-class="{active: isState('content-view.version.docker')}"
|
68
61
|
ng-show="version.docker_tag_count !== 0 || version.docker_manifest_count !== 0">
|
69
62
|
<a ui-sref="content-view.version.docker({versionId: version.id})">
|
data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js
CHANGED
@@ -45,11 +45,6 @@
|
|
45
45
|
resource: 'Package',
|
46
46
|
display: translate('Packages'),
|
47
47
|
repositoryType: 'yum'
|
48
|
-
}, {
|
49
|
-
state: 'puppet-modules',
|
50
|
-
resource: 'PuppetModule',
|
51
|
-
display: translate('Puppet Modules'),
|
52
|
-
repositoryType: 'puppet'
|
53
48
|
}, {
|
54
49
|
state: 'docker',
|
55
50
|
resource: 'DockerTag',
|
@@ -97,17 +97,6 @@ angular.module('Bastion.environments').config(['$stateProvider', function ($stat
|
|
97
97
|
parent: 'environment.details'
|
98
98
|
}
|
99
99
|
})
|
100
|
-
.state('environment.puppet-modules', {
|
101
|
-
url: '/puppet-modules?contentViewId',
|
102
|
-
reloadOnSearch: false,
|
103
|
-
permission: 'view_lifecycle_environments',
|
104
|
-
controller: 'EnvironmentContentController',
|
105
|
-
templateUrl: 'environments/details/views/environment-puppet-modules.html',
|
106
|
-
ncyBreadcrumb: {
|
107
|
-
label: '{{ "Puppet Modules" | translate }}',
|
108
|
-
parent: 'environment.details'
|
109
|
-
}
|
110
|
-
})
|
111
100
|
.state('environment.docker', {
|
112
101
|
url: '/docker?repositoryId&contentViewId',
|
113
102
|
reloadOnSearch: false,
|
@@ -42,9 +42,6 @@
|
|
42
42
|
<td class="info-block" ng-hide="library.counts.errata.total == 0" translate>
|
43
43
|
Errata <div>{{ library.counts.errata.total || 0 }}</div>
|
44
44
|
</td>
|
45
|
-
<td class="info-block" ng-hide="library.counts.puppet_modules == 0" translate>
|
46
|
-
Puppet Modules <div>{{ library.counts.puppet_modules || 0 }}</div>
|
47
|
-
</td>
|
48
45
|
<td class="info-block" ng-hide="library.counts.module_streams == 0" translate>
|
49
46
|
Module Streams <div>{{ library.counts.module_streams || 0 }}</div>
|
50
47
|
</td>
|
@@ -3,19 +3,21 @@
|
|
3
3
|
* @name Bastion.errata.controller:IncrementalUpdateController
|
4
4
|
*
|
5
5
|
* @requires $scope
|
6
|
+
* @requires $window
|
6
7
|
* @requires translate
|
7
8
|
* @requires IncrementalUpdate
|
8
9
|
* @requires ContentHostBulkAction
|
9
10
|
* @requires ContentViewVersion
|
10
11
|
* @requires CurrentOrganization
|
11
12
|
* @requires Notification
|
13
|
+
* @requires BastionConfig
|
12
14
|
*
|
13
15
|
* @description
|
14
16
|
* Display confirmation screen and apply Errata.
|
15
17
|
*/
|
16
18
|
angular.module('Bastion.errata').controller('ApplyErrataController',
|
17
|
-
['$scope', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization', 'Notification',
|
18
|
-
function ($scope, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization, Notification) {
|
19
|
+
['$scope', '$window', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization', 'Notification', 'BastionConfig',
|
20
|
+
function ($scope, $window, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization, Notification, BastionConfig) {
|
19
21
|
var applyErrata, incrementalUpdate;
|
20
22
|
|
21
23
|
function transitionToTask(task) {
|
@@ -30,6 +32,15 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
|
|
30
32
|
|
31
33
|
$scope.applyingErrata = false;
|
32
34
|
|
35
|
+
$scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
|
36
|
+
$scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
|
37
|
+
$scope.errataActionFormValues = {
|
38
|
+
authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
|
39
|
+
errata: IncrementalUpdate.getErrataIds().join(','),
|
40
|
+
hostIds: IncrementalUpdate.getBulkContentHosts().included.ids.join(','),
|
41
|
+
customize: false
|
42
|
+
};
|
43
|
+
|
33
44
|
$scope.hasComposites = function (updates) {
|
34
45
|
var composite;
|
35
46
|
|
@@ -123,11 +134,15 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
|
|
123
134
|
});
|
124
135
|
|
125
136
|
$scope.confirmApply = function() {
|
126
|
-
$scope.
|
127
|
-
|
128
|
-
applyErrata();
|
137
|
+
if ($scope.remoteExecutionPresent && $scope.remoteExecutionByDefault) {
|
138
|
+
angular.element('#errataActionForm').submit();
|
129
139
|
} else {
|
130
|
-
|
140
|
+
$scope.applyingErrata = true;
|
141
|
+
if ($scope.updates.length === 0) {
|
142
|
+
applyErrata();
|
143
|
+
} else {
|
144
|
+
incrementalUpdate();
|
145
|
+
}
|
131
146
|
}
|
132
147
|
};
|
133
148
|
|
@@ -15,6 +15,15 @@
|
|
15
15
|
<section class="details details-full" ng-show="selectedContentHosts && errataIds">
|
16
16
|
<h3 ng-show="errata" translate>Apply {{ errata.errata_id }}</h3>
|
17
17
|
|
18
|
+
<form id="errataActionForm" method="post" action="/katello/remote_execution">
|
19
|
+
<input type="hidden" name="remote_action" value="errata_install"/>
|
20
|
+
<input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
|
21
|
+
<input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
|
22
|
+
<input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
|
23
|
+
<input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
|
24
|
+
<input type="hidden" name="install_all" ng-value="table.allResultsSelected" />
|
25
|
+
</form>
|
26
|
+
|
18
27
|
<section ng-hide="updates.length > 0">
|
19
28
|
<div ng-show="errata">
|
20
29
|
<p translate ng-show="contentHostIds.length === 0">
|