katello 4.8.4 → 4.9.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 +40 -4
- data/app/assets/javascripts/katello/locale/bn/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/cs/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/de/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/en/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/es/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/fr/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/gu/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/hi/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/it/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/ja/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/ka/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/kn/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/ko/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/locale/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/mr/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/or/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/pa/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/pt/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/pt_BR/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/ru/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/ta/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/te/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/zh_CN/katello.js +1 -0
- data/app/assets/javascripts/katello/locale/zh_TW/katello.js +1 -0
- data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb +10 -0
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +1 -0
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +2 -0
- data/app/controllers/katello/api/v2/content_views_controller.rb +22 -12
- data/app/controllers/katello/api/v2/environments_controller.rb +5 -1
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +1 -1
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +1 -2
- data/app/controllers/katello/api/v2/organizations_controller.rb +11 -0
- data/app/controllers/katello/api/v2/repositories_controller.rb +4 -3
- data/app/controllers/katello/api/v2/repository_sets_controller.rb +13 -4
- data/app/controllers/katello/api/v2/simple_content_access_controller.rb +1 -3
- data/app/controllers/katello/concerns/api/api_controller.rb +2 -2
- data/app/controllers/katello/concerns/content_facet_hosts_controller_extensions.rb +1 -1
- data/app/helpers/katello/hosts_and_hostgroups_helper.rb +6 -4
- data/app/lib/actions/candlepin/product/content_add.rb +13 -1
- data/app/lib/actions/candlepin/product/content_update.rb +2 -1
- data/app/lib/actions/katello/agent_action.rb +3 -4
- data/app/lib/actions/katello/bulk_agent_action.rb +1 -4
- data/app/lib/actions/katello/content_view/publish.rb +1 -0
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +1 -0
- data/app/lib/actions/katello/host/update_content_view.rb +2 -4
- data/app/lib/actions/katello/organization/simple_content_access/enable.rb +0 -10
- data/app/lib/actions/katello/organization/simple_content_access/toggle.rb +2 -12
- data/app/lib/actions/katello/product/content_create.rb +2 -2
- data/app/lib/actions/katello/repository/destroy.rb +15 -7
- data/app/lib/actions/katello/repository/update.rb +23 -1
- data/app/lib/actions/pulp3/abstract_async_task.rb +2 -0
- data/app/lib/actions/pulp3/orchestration/repository/generate_metadata.rb +5 -12
- data/app/lib/katello/concerns/base_template_scope_extensions.rb +34 -2
- data/app/lib/katello/event_daemon/runner.rb +8 -4
- data/app/lib/katello/repo_discovery.rb +3 -1
- data/app/lib/katello/resources/cdn/katello_cdn.rb +4 -8
- data/app/lib/katello/util/default_enablement_migrator.rb +183 -0
- data/app/models/katello/activation_key.rb +4 -0
- data/app/models/katello/alternate_content_source.rb +13 -8
- data/app/models/katello/candlepin/repository_mapper.rb +0 -1
- data/app/models/katello/concerns/content_view_filter_rule_common.rb +42 -0
- data/app/models/katello/concerns/host_managed_extensions.rb +9 -40
- data/app/models/katello/concerns/smart_proxy_extensions.rb +24 -23
- data/app/models/katello/content.rb +9 -0
- data/app/models/katello/content_view.rb +99 -4
- data/app/models/katello/content_view_environment_content_facet.rb +12 -0
- data/app/models/katello/content_view_filter.rb +5 -1
- data/app/models/katello/content_view_package_filter_rule.rb +0 -1
- data/app/models/katello/content_view_repository.rb +0 -1
- data/app/models/katello/content_view_version.rb +26 -0
- data/app/models/katello/docker_meta_tag.rb +4 -0
- data/app/models/katello/host/content_facet.rb +2 -0
- data/app/models/katello/kt_environment.rb +13 -3
- data/app/models/katello/ping.rb +1 -1
- data/app/models/katello/product.rb +1 -1
- data/app/models/katello/product_content.rb +13 -15
- data/app/models/katello/root_repository.rb +21 -2
- data/app/models/katello/sync_plan.rb +2 -6
- data/app/presenters/katello/host_package_presenter.rb +5 -3
- data/app/services/katello/product_content_finder.rb +6 -1
- data/app/services/katello/pulp3/alternate_content_source.rb +5 -0
- data/app/services/katello/pulp3/module_stream.rb +2 -12
- data/app/services/katello/pulp3/repository/yum.rb +3 -0
- data/app/views/foreman/job_templates/install_errata.erb +4 -4
- data/app/views/foreman/job_templates/install_errata_-_katello_ansible_default.erb +4 -7
- data/app/views/foreman/job_templates/install_errata_by_search_query.erb +5 -6
- data/app/views/katello/api/v2/activation_keys/base.json.rabl +6 -0
- data/app/views/katello/api/v2/common/destroy.json.rabl +2 -1
- data/app/views/katello/api/v2/content_credentials/show.json.rabl +1 -1
- data/app/views/katello/api/v2/content_facet/base.json.rabl +10 -9
- data/app/views/katello/api/v2/content_view_repositories/show_all.json.rabl +6 -0
- data/app/views/katello/api/v2/content_view_versions/base.json.rabl +11 -1
- data/app/views/katello/api/v2/content_views/base.json.rabl +3 -0
- data/app/views/katello/api/v2/docker_tags/_base.json.rabl +4 -0
- data/app/views/katello/api/v2/environments/show.json.rabl +10 -0
- data/app/views/katello/api/v2/host_subscriptions/show.json.rabl +1 -0
- data/app/views/katello/api/v2/repositories/index.json.rabl +6 -0
- data/app/views/katello/api/v2/repositories/show.json.rabl +1 -0
- data/app/views/katello/api/v2/repository_sets/show.json.rabl +8 -2
- data/app/views/overrides/activation_keys/_host_environment_select.html.erb +22 -15
- data/app/views/smart_proxies/_disk_usage.html.erb +2 -0
- data/ca/redhat-uep.pem +53 -53
- data/db/migrate/20220228173251_remove_drpm_from_ignorable_content.rb +0 -1
- data/db/migrate/20230328180352_add_applied_filters_to_katello_content_view_versions.rb +5 -0
- data/db/migrate/20230503190626_add_metadata_expire_to_root.rb +5 -0
- data/db/seeds.d/111-upgrade_tasks.rb +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-associations.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js +16 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html +4 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html +15 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-subscriptions.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/views/content-credentials.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-host-bulk-module-streams-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html +10 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-host-collections-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-traces-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js +2 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js +2 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +0 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/deb.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html +12 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-repositories.controller.js +43 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-details.html +7 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-environments.html +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-info.html +0 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-repositories.html +60 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.controller.js +0 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.routes.js +10 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/views/docker-tags.html +0 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum-content-hosts.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-info.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-packages.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html +7 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-hosts.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html +4 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-hosts-list.html +4 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +590 -175
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/bn.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/bn_IN.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ca.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/cs_CZ.po +5204 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/de_AT.po +5153 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/de_DE.po +5159 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/el.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/en_GB.po +5158 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/en_US.po +5153 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/et_EE.po +5153 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/gl.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/gu.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/he_IL.po +5191 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/hi.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/id.po +5136 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/it.po +5303 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ka.po +34 -14
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/kn.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ml_IN.po +5153 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/mr.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/nl_NL.po +5161 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/or.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/pa.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/pl.po +5192 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/pl_PL.po +5187 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/pt.po +5174 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ro.po +5170 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ro_RO.po +5170 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ru.po +5279 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/sl.po +5191 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/sv_SE.po +5158 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ta.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ta_IN.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/te.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/tr.po +5157 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/vi.po +5136 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/vi_VN.po +5136 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/zh.po +5136 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/translations.js +38 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/views/organization-selector.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/package.controller.js +8 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html +12 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-http-proxy-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +13 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js +12 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details-reclaim-space-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html +6 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +17 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifest-lists.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-tags.html +0 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +6 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +20 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository.factory.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories-reclaim-space-modal.html +1 -1
- data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/activation_keys.scss +13 -0
- data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss +1 -0
- data/lib/katello/engine.rb +0 -7
- data/lib/katello/plugin.rb +18 -15
- data/lib/katello/tasks/upgrades/4.9/update_custom_products_enablement.rake +11 -0
- data/lib/katello/version.rb +1 -1
- data/locale/action_names.rb +1 -2
- data/locale/bn/LC_MESSAGES/katello.mo +0 -0
- data/locale/bn/katello.po +215 -183
- data/locale/bn_IN/LC_MESSAGES/katello.mo +0 -0
- data/locale/bn_IN/katello.po +8901 -0
- data/locale/ca/LC_MESSAGES/katello.mo +0 -0
- data/locale/ca/katello.po +8900 -0
- data/locale/cs/LC_MESSAGES/katello.mo +0 -0
- data/locale/cs/katello.po +216 -185
- data/locale/cs_CZ/LC_MESSAGES/katello.mo +0 -0
- data/locale/cs_CZ/katello.po +8906 -0
- data/locale/de/LC_MESSAGES/katello.mo +0 -0
- data/locale/de/katello.po +223 -191
- data/locale/de_AT/LC_MESSAGES/katello.mo +0 -0
- data/locale/de_AT/katello.po +8897 -0
- data/locale/de_DE/LC_MESSAGES/katello.mo +0 -0
- data/locale/de_DE/katello.po +8906 -0
- data/locale/el/LC_MESSAGES/katello.mo +0 -0
- data/locale/el/katello.po +8900 -0
- data/locale/en/LC_MESSAGES/katello.mo +0 -0
- data/locale/en/katello.po +215 -183
- data/locale/en_GB/LC_MESSAGES/katello.mo +0 -0
- data/locale/en_GB/katello.po +8902 -0
- data/locale/en_US/LC_MESSAGES/katello.mo +0 -0
- data/locale/en_US/katello.po +8897 -0
- data/locale/es/LC_MESSAGES/katello.mo +0 -0
- data/locale/es/katello.po +218 -187
- data/locale/et_EE/LC_MESSAGES/katello.mo +0 -0
- data/locale/et_EE/katello.po +8897 -0
- data/locale/fr/LC_MESSAGES/katello.mo +0 -0
- data/locale/fr/katello.po +233 -204
- data/locale/gl/LC_MESSAGES/katello.mo +0 -0
- data/locale/gl/katello.po +8900 -0
- data/locale/gu/LC_MESSAGES/katello.mo +0 -0
- data/locale/gu/katello.po +215 -183
- data/locale/he_IL/LC_MESSAGES/katello.mo +0 -0
- data/locale/he_IL/katello.po +8902 -0
- data/locale/hi/LC_MESSAGES/katello.mo +0 -0
- data/locale/hi/katello.po +215 -183
- data/locale/id/LC_MESSAGES/katello.mo +0 -0
- data/locale/id/katello.po +8896 -0
- data/locale/it/LC_MESSAGES/katello.mo +0 -0
- data/locale/it/katello.po +216 -185
- data/locale/ja/LC_MESSAGES/katello.mo +0 -0
- data/locale/ja/katello.po +233 -202
- data/locale/ka/LC_MESSAGES/katello.mo +0 -0
- data/locale/ka/katello.po +223 -191
- data/locale/katello.pot +1844 -1796
- data/locale/kn/LC_MESSAGES/katello.mo +0 -0
- data/locale/kn/katello.po +215 -183
- data/locale/ko/LC_MESSAGES/katello.mo +0 -0
- data/locale/ko/katello.po +216 -183
- data/locale/ml_IN/LC_MESSAGES/katello.mo +0 -0
- data/locale/ml_IN/katello.po +8897 -0
- data/locale/mr/LC_MESSAGES/katello.mo +0 -0
- data/locale/mr/katello.po +215 -183
- data/locale/nl_NL/LC_MESSAGES/katello.mo +0 -0
- data/locale/nl_NL/katello.po +8907 -0
- data/locale/or/LC_MESSAGES/katello.mo +0 -0
- data/locale/or/katello.po +215 -183
- data/locale/pa/LC_MESSAGES/katello.mo +0 -0
- data/locale/pa/katello.po +215 -183
- data/locale/pl/LC_MESSAGES/katello.mo +0 -0
- data/locale/pl/katello.po +8903 -0
- data/locale/pl_PL/LC_MESSAGES/katello.mo +0 -0
- data/locale/pl_PL/katello.po +8899 -0
- data/locale/pt/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt/katello.po +215 -183
- data/locale/pt_BR/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt_BR/katello.po +218 -187
- data/locale/ro/LC_MESSAGES/katello.mo +0 -0
- data/locale/ro/katello.po +8897 -0
- data/locale/ro_RO/LC_MESSAGES/katello.mo +0 -0
- data/locale/ro_RO/katello.po +8898 -0
- data/locale/ru/LC_MESSAGES/katello.mo +0 -0
- data/locale/ru/katello.po +216 -184
- data/locale/sl/LC_MESSAGES/katello.mo +0 -0
- data/locale/sl/katello.po +8901 -0
- data/locale/sv_SE/LC_MESSAGES/katello.mo +0 -0
- data/locale/sv_SE/katello.po +8903 -0
- data/locale/ta/LC_MESSAGES/katello.mo +0 -0
- data/locale/ta/katello.po +215 -183
- data/locale/ta_IN/LC_MESSAGES/katello.mo +0 -0
- data/locale/ta_IN/katello.po +8901 -0
- data/locale/te/LC_MESSAGES/katello.mo +0 -0
- data/locale/te/katello.po +215 -183
- data/locale/tr/LC_MESSAGES/katello.mo +0 -0
- data/locale/tr/katello.po +8900 -0
- data/locale/vi/LC_MESSAGES/katello.mo +0 -0
- data/locale/vi/katello.po +8896 -0
- data/locale/vi_VN/LC_MESSAGES/katello.mo +0 -0
- data/locale/vi_VN/katello.po +8897 -0
- data/locale/zh/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh/katello.po +8896 -0
- data/locale/zh_CN/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_CN/katello.po +233 -202
- data/locale/zh_TW/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_TW/katello.po +216 -183
- data/package.json +1 -0
- data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js +1 -0
- data/webpack/components/Bookmark/AddBookmarkModal.js +8 -2
- data/webpack/components/Content/ContentTable.js +1 -0
- data/webpack/components/Content/Details/ContentDetailInfo.js +1 -1
- data/webpack/components/Content/Details/ContentDetails.js +3 -3
- data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetailInfo.test.js.snap +1 -0
- data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap +4 -0
- data/webpack/components/Content/__tests__/__snapshots__/ContentTable.test.js.snap +1 -0
- data/webpack/components/RoutedTabs/index.js +1 -1
- data/webpack/components/SelectOrg/SetOrganization.js +7 -1
- data/webpack/components/Table/EmptyStateMessage.js +8 -3
- data/webpack/components/Table/MainTable.js +8 -2
- data/webpack/components/TooltipButton/TooltipButton.js +2 -2
- data/webpack/components/TooltipButton/__snapshots__/TooltipButton.test.js.snap +3 -0
- data/webpack/components/extensions/HostDetails/ActionsBar/index.js +2 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ChangeHostCVModal.js +81 -24
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ChangeHostCVModal.scss +3 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ContentViewDetailsCard.js +10 -3
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/HostContentViewActions.js +8 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard.js +3 -2
- data/webpack/components/extensions/HostDetails/DetailsTabCards/HwPropertiesCard.js +3 -1
- data/webpack/components/extensions/HostDetails/Tabs/ContentTab/SecondaryTabsRoutes.js +1 -1
- data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.js +0 -4
- data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErratumExpansionDetail.js +2 -2
- data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js +1 -5
- data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js +20 -0
- data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionConstants.js +1 -0
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsConstants.js +16 -0
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js +54 -8
- data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesEnabler.js +1 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap +8 -1
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/Force.test.js.snap +1 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/IgnoreSubmanErrors.test.js.snap +1 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/LifeCycleEnvironment.test.js.snap +1 -0
- data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js +2 -1
- data/webpack/components/extensions/RegistrationCommands/fields/Force.js +1 -0
- data/webpack/components/extensions/RegistrationCommands/fields/IgnoreSubmanErrors.js +1 -0
- data/webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js +1 -0
- data/webpack/components/extensions/about/index.js +2 -2
- data/webpack/components/pf3Table/components/Table.js +1 -0
- data/webpack/scenes/AlternateContentSources/ACSIndexPage.js +6 -1
- data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCredentials.js +15 -2
- data/webpack/scenes/AlternateContentSources/Create/Steps/SelectSource.js +6 -1
- data/webpack/scenes/AlternateContentSources/Details/ACSExpandableDetails.js +4 -1
- data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditCredentials.js +9 -0
- data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditURLPaths.js +1 -0
- data/webpack/scenes/Content/Details/ContentDetails.js +4 -2
- data/webpack/scenes/Content/Details/ContentRepositories.js +1 -1
- data/webpack/scenes/Content/GenericContentPage.js +1 -1
- data/webpack/scenes/Content/Table/ContentTable.js +2 -2
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +4 -0
- data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignActivationKeysForm.js +26 -13
- data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignHostsForm.js +27 -13
- data/webpack/scenes/ContentViews/Delete/__tests__/cvVersionsData.fixtures.json +8 -4
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js +3 -2
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentEnvironments.js +1 -1
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js +25 -24
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js +1 -1
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +19 -3
- data/webpack/scenes/ContentViews/Details/ContentViewDetailReducer.js +6 -0
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +2 -0
- data/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js +2 -2
- data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js +15 -2
- data/webpack/scenes/ContentViews/Details/Filters/ArtifactsWithNoErrata.js +5 -1
- data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js +13 -9
- data/webpack/scenes/ContentViews/Details/Filters/CVDebFilterContent.js +19 -6
- data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js +5 -1
- data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js +50 -51
- data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js +45 -44
- data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js +45 -44
- data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js +13 -8
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetailsHeader.js +4 -3
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +5 -2
- data/webpack/scenes/ContentViews/Details/Filters/FilterRuleConstants.js +6 -0
- data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVDebMatchContentModal.js +3 -2
- data/webpack/scenes/ContentViews/Details/Filters/Rules/ContainerTag/AddEditContainerTagRuleModal.js +10 -2
- data/webpack/scenes/ContentViews/Details/Filters/Rules/DebPackage/AddEditDebPackageRuleModal.js +5 -1
- data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js +7 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js +37 -24
- data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js +3 -3
- data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js +1 -1
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +78 -8
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +27 -8
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailNoReposAdded.fixtures.json +13 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/ActionSummary.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignActivationKeys.js +16 -16
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignHosts.js +16 -16
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/BulkDeleteVersions.fixtures.json +6 -3
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/contentViewVersion.fixtures.json +10 -5
- data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareConfig.js +9 -2
- data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareTable.js +1 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionOneDetials.fixtures.json +2 -1
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionThreeDetails.fixtures.json +2 -1
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionTwoDetails.fixtures.json +2 -1
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersions.fixtures.json +12 -6
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionOneDetails.fixtures.json +2 -1
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionTwoDetails.fixtures.json +2 -1
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js +25 -4
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVEnvironmentSelectionForm.js +4 -2
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js +26 -13
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignHostsForm.js +30 -17
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js +1 -0
- data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/versionsResponseData.fixtures.json +6 -3
- data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js +2 -2
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js +8 -1
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js +55 -6
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionComponent.fixtures.json +6 -3
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.fixtures.json +2 -1
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.fixtures.json +8 -4
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionsWithTask.fixtures.json +4 -2
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json +1 -0
- data/webpack/scenes/ContentViews/Publish/CVPublishFinish.js +4 -2
- data/webpack/scenes/ContentViews/Publish/CVPublishForm.js +30 -3
- data/webpack/scenes/ContentViews/Publish/CVPublishReview.js +24 -2
- data/webpack/scenes/ContentViews/Publish/cvPublishForm.scss +4 -0
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +2 -2
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +1 -3
- data/webpack/scenes/ContentViews/__tests__/mockDetails.fixtures.json +2 -1
- data/webpack/scenes/ContentViews/components/ContentViewSelect/ContentViewSelect.js +2 -1
- data/webpack/scenes/ContentViews/components/ContentViewSelect/ContentViewSelectOption.js +3 -2
- data/webpack/scenes/ContentViews/components/ContentViewSelect/helpers.js +32 -0
- data/webpack/scenes/ContentViews/components/ContentViewsCounter.js +52 -42
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.js +1 -0
- data/webpack/scenes/ContentViews/components/FiltersAppliedIcon.js +17 -0
- data/webpack/scenes/ContentViews/components/NeedsPublishIcon.js +45 -0
- data/webpack/scenes/ContentViews/components/NeedsPublishIcon.scss +9 -0
- data/webpack/scenes/ContentViews/expansions/RelatedContentViewComponentsModal.js +1 -1
- data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceForm.js +49 -22
- data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceTemplate.js +7 -1
- data/webpack/scenes/Hosts/ChangeContentSource/components/FormField.js +1 -0
- data/webpack/scenes/Hosts/ChangeContentSource/components/HostsModal.js +2 -0
- data/webpack/scenes/Hosts/ChangeContentSource/index.js +2 -0
- data/webpack/scenes/ModuleStreams/Details/__tests__/__snapshots__/ModuleStreamDetailInfo.test.js.snap +1 -0
- data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamsTable.test.js.snap +1 -0
- data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js +2 -0
- data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap +2 -0
- data/webpack/scenes/RedHatRepositories/components/RecommendedRepositorySetsToggler.js +6 -1
- data/webpack/scenes/RedHatRepositories/components/RepositorySetRepositories.js +1 -1
- data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RecommendedRepositorySetsToggler.test.js.snap +1 -0
- data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RepositorySetRepositories.test.js.snap +1 -0
- data/webpack/scenes/RedHatRepositories/helpers.js +2 -0
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js +1 -1
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailInfo.js +2 -2
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js +4 -4
- data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailAssociations.test.js.snap +1 -0
- data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailInfo.test.js.snap +2 -0
- data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap +4 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/NetworkSyncForm.js +2 -1
- data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +5 -4
- data/webpack/scenes/Subscriptions/Manifest/SimpleContentAccess.js +1 -0
- data/webpack/scenes/Subscriptions/SubscriptionsPage.js +1 -1
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js +3 -1
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/__snapshots__/UpstreamSubscriptionsPage.test.js.snap +3 -0
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap +1 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js +1 -1
- data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js +5 -6
- data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/__snapshots__/SubscriptionsToolbar.test.js.snap +60 -5
- data/webpack/utils/useKatelloDocUrl.js +18 -0
- metadata +163 -22
- data/app/lib/actions/katello/organization/simple_content_access/prepare_content_overrides.rb +0 -36
- data/app/lib/katello/util/content_overrides_migrator.rb +0 -98
- data/webpack/components/extensions/HostDetails/common/KatelloAgentDeprecationAlert.js +0 -23
@@ -5,6 +5,8 @@
|
|
5
5
|
<h3 translate ng-show="selectedErrataOption === 'current'">Installable Errata</h3>
|
6
6
|
</div>
|
7
7
|
|
8
|
+
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
9
|
+
|
8
10
|
<div ng-hide="host.hasContent()">
|
9
11
|
<div data-extend-template="common/views/registration.html"></div>
|
10
12
|
</div>
|
@@ -2,6 +2,7 @@
|
|
2
2
|
|
3
3
|
<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
|
4
4
|
<h4 translate>Package Actions</h4>
|
5
|
+
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
5
6
|
<p bst-alert="warning" ng-hide="hostToolingEnabled">
|
6
7
|
<span translate>
|
7
8
|
Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
|
@@ -1,6 +1,7 @@
|
|
1
1
|
<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
|
2
2
|
|
3
3
|
<h3 translate>Applicable Packages</h3>
|
4
|
+
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
4
5
|
|
5
6
|
<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
|
6
7
|
<p bst-alert="warning" ng-hide="hostToolingEnabled">
|
@@ -2,6 +2,8 @@
|
|
2
2
|
|
3
3
|
<h3 translate>Installed Packages</h3>
|
4
4
|
|
5
|
+
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
6
|
+
|
5
7
|
<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
|
6
8
|
<p bst-alert="warning" ng-hide="hostToolingEnabled">
|
7
9
|
<span translate>
|
@@ -15,7 +15,6 @@
|
|
15
15
|
* @requires ContentHostsHelper
|
16
16
|
* @requires simpleContentAccessEnabled
|
17
17
|
* @requires newHostDetailsUI
|
18
|
-
* @requires BastionConfig
|
19
18
|
*
|
20
19
|
* @description
|
21
20
|
* Provides the functionality specific to Content Hosts for use with the Nutupane UI pattern.
|
@@ -23,8 +22,8 @@
|
|
23
22
|
* within the table.
|
24
23
|
*/
|
25
24
|
angular.module('Bastion.content-hosts').controller('ContentHostsController',
|
26
|
-
['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer', 'simpleContentAccessEnabled', 'newHostDetailsUI',
|
27
|
-
function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer, simpleContentAccessEnabled, newHostDetailsUI
|
25
|
+
['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer', 'simpleContentAccessEnabled', 'newHostDetailsUI',
|
26
|
+
function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer, simpleContentAccessEnabled, newHostDetailsUI) {
|
28
27
|
var nutupane, params, query;
|
29
28
|
|
30
29
|
if ($location.search().search) {
|
@@ -52,7 +51,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
|
|
52
51
|
$scope.nutupane = nutupane;
|
53
52
|
$scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
|
54
53
|
$scope.newHostDetailsUI = newHostDetailsUI;
|
55
|
-
$scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
|
56
54
|
|
57
55
|
// @TODO begin hack necessary because of foreman API bug http://projects.theforeman.org/issues/13877
|
58
56
|
$scope.table.sortBy = function (column) {
|
@@ -14,14 +14,13 @@
|
|
14
14
|
* @requires deleteHostOnUnregister
|
15
15
|
* @requires ContentHostsHelper
|
16
16
|
* @requires simpleContentAccessEnabled
|
17
|
-
* @requires BastionConfig
|
18
17
|
*
|
19
18
|
* @description
|
20
19
|
* Provides the functionality for the content host details action pane.
|
21
20
|
*/
|
22
21
|
angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
|
23
|
-
['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled',
|
24
|
-
function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled
|
22
|
+
['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled',
|
23
|
+
function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled) {
|
25
24
|
$scope.menuExpander = MenuExpander;
|
26
25
|
|
27
26
|
$scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
|
@@ -37,7 +36,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
|
|
37
36
|
|
38
37
|
$scope.purposeAddonsCount = 0;
|
39
38
|
$scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
|
40
|
-
$scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
|
41
39
|
|
42
40
|
$scope.panel = {
|
43
41
|
error: false,
|
@@ -54,7 +54,6 @@
|
|
54
54
|
|
55
55
|
<nav data-block="navigation">
|
56
56
|
<div content-access-mode-banner></div>
|
57
|
-
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
58
57
|
<ul class="nav nav-tabs">
|
59
58
|
<li ng-class="{active: isState('content-host.info')}">
|
60
59
|
<a translate
|
@@ -66,10 +66,6 @@
|
|
66
66
|
</span>
|
67
67
|
</div>
|
68
68
|
|
69
|
-
<span data-block="messages">
|
70
|
-
<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
|
71
|
-
</span>
|
72
|
-
|
73
69
|
<span data-block="no-rows-message" translate>
|
74
70
|
You currently don't have any Content Hosts, you can register one by clicking the button on the right and following the instructions.
|
75
71
|
</span>
|
data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/deb.controller.js
CHANGED
@@ -6,11 +6,12 @@
|
|
6
6
|
*
|
7
7
|
* @requires Host
|
8
8
|
* @requires CurrentOrganization
|
9
|
+
* @requires newHostDetailsUI
|
9
10
|
*
|
10
11
|
* @description
|
11
12
|
* Provides the functionality for the debs details action pane.
|
12
13
|
*/
|
13
|
-
function DebController($scope, Deb, Host, CurrentOrganization, ApiErrorHandler) {
|
14
|
+
function DebController($scope, Deb, Host, CurrentOrganization, ApiErrorHandler, newHostDetailsUI) {
|
14
15
|
$scope.panel = {
|
15
16
|
error: false,
|
16
17
|
loading: true
|
@@ -21,6 +22,7 @@
|
|
21
22
|
}
|
22
23
|
|
23
24
|
$scope.installedPackageCount = undefined;
|
25
|
+
$scope.newHostDetailsUI = (newHostDetailsUI === 'true');
|
24
26
|
|
25
27
|
$scope.fetchHostCount = function() {
|
26
28
|
Host.get({'per_page': 0, 'search': $scope.createRawSearchString('installed_deb'), 'organization_id': CurrentOrganization}, function (data) {
|
@@ -49,6 +51,6 @@
|
|
49
51
|
.module('Bastion.debs')
|
50
52
|
.controller('DebController', DebController);
|
51
53
|
|
52
|
-
DebController.$inject = ['$scope', 'Deb', 'Host', 'CurrentOrganization', 'ApiErrorHandler'];
|
54
|
+
DebController.$inject = ['$scope', 'Deb', 'Host', 'CurrentOrganization', 'ApiErrorHandler', 'newHostDetailsUI'];
|
53
55
|
|
54
56
|
})();
|
data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html
CHANGED
@@ -9,7 +9,10 @@
|
|
9
9
|
<dd>
|
10
10
|
<i class="fa fa-spinner fa-spin" ng-show="installedDebCount === undefined"></i>
|
11
11
|
<span ng-show="installedDebCount !== undefined">
|
12
|
-
<a href="{{ '/
|
12
|
+
<a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('installed_deb') }}" translate>
|
13
|
+
{{ installedDebCount }} Host(s)
|
14
|
+
</a>
|
15
|
+
<a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('installed_deb') }}" translate>
|
13
16
|
{{ installedDebCount }} Host(s)
|
14
17
|
</a>
|
15
18
|
</span>
|
@@ -17,14 +20,20 @@
|
|
17
20
|
|
18
21
|
<dt translate>Applicable To</dt>
|
19
22
|
<dd>
|
20
|
-
<a href="{{ '/
|
23
|
+
<a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('applicable_debs') }}" translate>
|
24
|
+
{{ deb.hosts_applicable_count }} Host(s)
|
25
|
+
</a>
|
26
|
+
<a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('applicable_debs') }}" translate>
|
21
27
|
{{ deb.hosts_applicable_count }} Host(s)
|
22
28
|
</a>
|
23
29
|
</dd>
|
24
30
|
|
25
31
|
<dt translate>Upgradable For</dt>
|
26
32
|
<dd>
|
27
|
-
<a href="{{ '/
|
33
|
+
<a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('upgradable_debs') }}" translate>
|
34
|
+
{{ deb.hosts_available_count }} Host(s)
|
35
|
+
</a>
|
36
|
+
<a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('upgradable_debs') }}" translate>
|
28
37
|
{{ deb.hosts_available_count }} Host(s)
|
29
38
|
</a>
|
30
39
|
</dd>
|
@@ -0,0 +1,43 @@
|
|
1
|
+
/**
|
2
|
+
* @ngdoc object
|
3
|
+
* @name Bastion.docker-tags.controller:DockerTagDetailsController
|
4
|
+
*
|
5
|
+
* @requires $scope
|
6
|
+
* @requires $location
|
7
|
+
* @requires DockerTag
|
8
|
+
* @requires CurrentOrganization
|
9
|
+
*
|
10
|
+
* @description
|
11
|
+
* Provides the functionality for the docker tags details repositories list.
|
12
|
+
*/
|
13
|
+
angular.module('Bastion.docker-tags').controller('DockerTagRepositoriesController',
|
14
|
+
['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization',
|
15
|
+
function ($scope, $location, Nutupane, DockerTag, CurrentOrganization) {
|
16
|
+
var params = {
|
17
|
+
'organization_id': CurrentOrganization,
|
18
|
+
'search': $location.search().search || "",
|
19
|
+
'sort_by': 'name',
|
20
|
+
'sort_order': 'ASC',
|
21
|
+
'paged': false
|
22
|
+
};
|
23
|
+
|
24
|
+
var nutupane = new Nutupane(DockerTag, params, null, {disableAutoLoad: true});
|
25
|
+
|
26
|
+
var renderTable = function () {
|
27
|
+
params.action = 'repositories';
|
28
|
+
params.id = $scope.tag.id;
|
29
|
+
|
30
|
+
nutupane.setParams(params);
|
31
|
+
nutupane.refresh();
|
32
|
+
};
|
33
|
+
|
34
|
+
$scope.table = nutupane.table;
|
35
|
+
|
36
|
+
$scope.controllerName = 'katello_docker_tags';
|
37
|
+
|
38
|
+
$scope.tag.$promise.then(function() {
|
39
|
+
$scope.panel.loading = false;
|
40
|
+
renderTable();
|
41
|
+
});
|
42
|
+
}
|
43
|
+
]);
|
@@ -9,13 +9,6 @@
|
|
9
9
|
{{ tag.product.name }}
|
10
10
|
</a>
|
11
11
|
</dd>
|
12
|
-
|
13
|
-
<dt translate>Repository</dt>
|
14
|
-
<dd>
|
15
|
-
<a ui-sref="product.repository.manage-content.docker-manifests({productId: tag.product.id, repositoryId: tag.repository.id})">
|
16
|
-
{{ tag.repository.name }}
|
17
|
-
</a>
|
18
|
-
</dd>
|
19
12
|
</dl>
|
20
13
|
</div>
|
21
14
|
|
@@ -0,0 +1,60 @@
|
|
1
|
+
<div data-extend-template="layouts/partials/table.html">
|
2
|
+
<div data-block="search">
|
3
|
+
<input type="text"
|
4
|
+
class="form-control"
|
5
|
+
placeholder="{{ 'Filter' | translate }}"
|
6
|
+
ng-model="dockerTagFilter"/>
|
7
|
+
</div>
|
8
|
+
|
9
|
+
<span data-block="no-rows-message" translate>
|
10
|
+
This Container Image Tag is not present in any Repositories.
|
11
|
+
</span>
|
12
|
+
|
13
|
+
<span data-block="no-search-results-message" translate>
|
14
|
+
Your search returned zero Repositories.
|
15
|
+
</span>
|
16
|
+
|
17
|
+
<div data-block="table">
|
18
|
+
<table bst-table="table" class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
|
19
|
+
<thead>
|
20
|
+
<tr bst-table-head>
|
21
|
+
<th bst-table-column="name" translate>Name</th>
|
22
|
+
<th bst-table-column="product" translate>Product</th>
|
23
|
+
<th bst-table-column="contentView" translate>Content View</th>
|
24
|
+
<th bst-table-column="lastSync"><span translate>Last Sync</span></th>
|
25
|
+
</tr>
|
26
|
+
</thead>
|
27
|
+
|
28
|
+
<tbody>
|
29
|
+
<tr bst-table-row
|
30
|
+
ng-repeat="repo in table.rows | filter:dockerTagFilter">
|
31
|
+
<td bst-table-cell>
|
32
|
+
<a ng-href="/products/{{ repo.product.id }}/repositories/{{ repo.library_instance_id || repo.id }}">
|
33
|
+
{{ repo.name }}
|
34
|
+
</a>
|
35
|
+
</td>
|
36
|
+
<td bst-table-cell>
|
37
|
+
<a ui-sref="product.info({productId: repo.product.id})">
|
38
|
+
{{ repo.product.name }}
|
39
|
+
</a>
|
40
|
+
</td>
|
41
|
+
<td bst-table-cell>
|
42
|
+
{{ repo.content_view.name }}
|
43
|
+
</td>
|
44
|
+
<td bst-table-cell>
|
45
|
+
<span ng-show="repo.url">
|
46
|
+
<span ng-show="repo.last_sync == null" translate>
|
47
|
+
Not Synced
|
48
|
+
</span>
|
49
|
+
<span ng-hide="repo.last_sync == null">
|
50
|
+
<a href="/foreman_tasks/tasks/{{repo.last_sync.id}}">{{ repo.last_sync.result | capitalize}}</a>
|
51
|
+
<span translate>{{ repo.last_sync_words }} ago</span>
|
52
|
+
</span>
|
53
|
+
</span>
|
54
|
+
<span ng-hide="repo.url" translate>N/A</span>
|
55
|
+
</td>
|
56
|
+
</tr>
|
57
|
+
</tbody>
|
58
|
+
</table>
|
59
|
+
</div>
|
60
|
+
</div>
|
@@ -44,13 +44,5 @@ angular.module('Bastion.docker-tags').controller('DockerTagsController',
|
|
44
44
|
}
|
45
45
|
return versions.join(", ");
|
46
46
|
};
|
47
|
-
|
48
|
-
$scope.getRepositoryNames = function (tag) {
|
49
|
-
return tag.repositories.map(function(repo) {
|
50
|
-
return repo.name;
|
51
|
-
}).filter(function(item, index, names) {
|
52
|
-
return names.indexOf(item) >= index;
|
53
|
-
}).sort().join(', ');
|
54
|
-
};
|
55
47
|
}]
|
56
48
|
);
|
@@ -50,5 +50,15 @@ angular.module('Bastion.docker-tags').config(['$stateProvider', function ($state
|
|
50
50
|
label: "{{ 'Lifecycle Environments' | translate }}",
|
51
51
|
parent: 'docker-tag.info'
|
52
52
|
}
|
53
|
+
})
|
54
|
+
.state('docker-tag.repositories', {
|
55
|
+
url: '/repositories',
|
56
|
+
permission: 'view_products',
|
57
|
+
templateUrl: 'docker-tags/details/views/docker-tag-repositories.html',
|
58
|
+
controller: 'DockerTagRepositoriesController',
|
59
|
+
ncyBreadcrumb: {
|
60
|
+
label: "{{ 'Repositories' | translate }}",
|
61
|
+
parent: 'docker-tag.info'
|
62
|
+
}
|
53
63
|
});
|
54
64
|
}]);
|
@@ -21,7 +21,6 @@
|
|
21
21
|
<th bst-table-column="name">{{ "Name" | translate }}</th>
|
22
22
|
<th bst-table-column="schema_version">{{ "Available Schema Versions" | translate }}</th>
|
23
23
|
<th bst-table-column="product">{{ "Product Name" | translate }}</th>
|
24
|
-
<th bst-table-column="repository">{{ "Repository Name" | translate }}</th>
|
25
24
|
</tr>
|
26
25
|
</thead>
|
27
26
|
|
@@ -38,9 +37,6 @@
|
|
38
37
|
<td bst-table-cell>
|
39
38
|
{{ tag.product.name }}
|
40
39
|
</td>
|
41
|
-
<td bst-table-cell>
|
42
|
-
{{ getRepositoryNames(tag) }}
|
43
|
-
</td>
|
44
40
|
</tr>
|
45
41
|
</tbody>
|
46
42
|
</table>
|
@@ -77,7 +77,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
|
|
77
77
|
};
|
78
78
|
|
79
79
|
params['content_view_version_environments'] = [];
|
80
|
-
params['resolve_dependencies'] =
|
80
|
+
params['resolve_dependencies'] = !$scope.noDepSolve;
|
81
81
|
|
82
82
|
//get a list of unique content view version ids with their environments
|
83
83
|
angular.forEach($scope.updates, function (update) {
|
@@ -8,13 +8,14 @@
|
|
8
8
|
* @requires IncrementalUpdate
|
9
9
|
* @requires Environment
|
10
10
|
* @requires CurrentOrganization
|
11
|
+
* @requires newHostDetailsUI
|
11
12
|
*
|
12
13
|
* @description
|
13
14
|
* Provides the functionality for the available host collection details action pane.
|
14
15
|
*/
|
15
16
|
angular.module('Bastion.errata').controller('ErratumContentHostsController',
|
16
|
-
['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization',
|
17
|
-
function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization) {
|
17
|
+
['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization', 'newHostDetailsUI',
|
18
|
+
function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization, newHostDetailsUI) {
|
18
19
|
var nutupane, params, searchString, nutupaneParams = {
|
19
20
|
'overrideAutoLoad': true
|
20
21
|
};
|
@@ -32,6 +33,7 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
|
|
32
33
|
|
33
34
|
$scope.nutupane = nutupane;
|
34
35
|
$scope.table = nutupane.table;
|
36
|
+
$scope.newHostDetailsUI = newHostDetailsUI;
|
35
37
|
$scope.nutupane.searchTransform = function(term) {
|
36
38
|
var addition, errataSearchStringAddition = $scope.errataSearchString($scope.restrictInstallable);
|
37
39
|
if (errataSearchStringAddition) {
|
@@ -17,7 +17,7 @@
|
|
17
17
|
ng-model="environmentFilter"
|
18
18
|
ng-options="environment.id as environment.name for environment in environments"
|
19
19
|
ng-change="selectEnvironment(environmentFilter)">
|
20
|
-
<option value="" disabled selected >Filter by Environment</option>
|
20
|
+
<option translate value="" disabled selected >Filter by Environment</option>
|
21
21
|
</select>
|
22
22
|
|
23
23
|
|
@@ -62,9 +62,10 @@
|
|
62
62
|
<tr bst-table-row ng-repeat="contentHost in table.rows" row-select="contentHost"
|
63
63
|
ng-controller="ContentHostStatusController">
|
64
64
|
<td bst-table-cell>
|
65
|
-
<
|
66
|
-
{{ contentHost.name }}
|
67
|
-
|
65
|
+
<span ng-switch="newHostDetailsUI">
|
66
|
+
<a ng-switch-when="true" ng-href="/new/hosts/{{contentHost.name}}/content">{{ contentHost.name }}</a>
|
67
|
+
<a ng-switch-when="false" ui-sref="content-host.info({hostId: contentHost.id})">{{ contentHost.name }}</a>
|
68
|
+
</span>
|
68
69
|
</td>
|
69
70
|
<td bst-table-cell>{{ contentHost.operatingsystem_name }}</td>
|
70
71
|
<td bst-table-cell>{{ contentHost.content_facet_attributes.lifecycle_environment_name }}</td>
|
@@ -24,10 +24,10 @@
|
|
24
24
|
<dd>{{ errata.severity | errataSeverity }}</dd>
|
25
25
|
|
26
26
|
<dt translate>Issued</dt>
|
27
|
-
<dd><
|
27
|
+
<dd><long-date-time date="errata.issued" /></dd>
|
28
28
|
|
29
29
|
<dt translate>Last Updated On</dt>
|
30
|
-
<dd><
|
30
|
+
<dd><long-date-time date="errata.updated" /></dd>
|
31
31
|
|
32
32
|
<dt translate>Reboot Suggested?</dt>
|
33
33
|
<dd>{{ errata.reboot_suggested | booleanToYesNo }}</dd>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div data-block="left-column">
|
5
5
|
<h3 translate>Independent Packages</h3>
|
6
6
|
<ul>
|
7
|
-
<p ng-show="!errata.packages.length" >No Packages to show</p>
|
7
|
+
<p translate ng-show="!errata.packages.length" >No Packages to show</p>
|
8
8
|
<li ng-show="errata.packages.length" ng-repeat="package in errata.packages">
|
9
9
|
<a href="/packages?search={{package}}">
|
10
10
|
{{ package }}
|
@@ -16,7 +16,7 @@
|
|
16
16
|
<div data-block="right-column">
|
17
17
|
<h3 translate>Module Stream Packages</h3>
|
18
18
|
<ul class="list-unstyled">
|
19
|
-
<p ng-show="!errata.module_streams.length" >No Packages to show</p>
|
19
|
+
<p translate ng-show="!errata.module_streams.length" >No Packages to show</p>
|
20
20
|
<li ng-show="errata.module_streams.length" ng-repeat="moduleStream in errata.module_streams">
|
21
21
|
<i class="fa fa-chevron-{{ moduleStreamChevron(moduleStream.id) }} cursor-pointer selected-icon"
|
22
22
|
ng-click="toggleModuleStreamList(moduleStream.id)"></i>
|
@@ -116,6 +116,13 @@
|
|
116
116
|
</span>
|
117
117
|
</div>
|
118
118
|
|
119
|
+
<div class="checkbox" ng-show="updates.length > 0">
|
120
|
+
<label>
|
121
|
+
<input name="noDepSolve" ng-model="noDepSolve" type="checkbox"/>
|
122
|
+
<span translate>Skip dependency solving for a significant speed increase. If the update cannot be applied to the host, delete the incremental content view version and retry the application with dependency solving turned on.</span>
|
123
|
+
</label>
|
124
|
+
</div>
|
125
|
+
|
119
126
|
<div class="checkbox" ng-show="updates.length > 0">
|
120
127
|
<label>
|
121
128
|
<input name="applyErrata" ng-model="applyErrata" type="checkbox"/>
|
data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata.html
CHANGED
@@ -101,7 +101,7 @@
|
|
101
101
|
<span translate>{{ errata.hosts_applicable_count || 0 }} Applicable, </span>
|
102
102
|
<span translate>{{ errata.hosts_available_count || 0 }} Installable</span>
|
103
103
|
</td>
|
104
|
-
<td bst-table-cell><
|
104
|
+
<td bst-table-cell><long-date-time date="errata.updated" /></td>
|
105
105
|
</tr>
|
106
106
|
</tbody>
|
107
107
|
</table>
|
@@ -10,13 +10,14 @@
|
|
10
10
|
* @requires Host
|
11
11
|
* @requires HostCollection
|
12
12
|
* @requires Notification
|
13
|
+
* @requires newHostDetailsUI
|
13
14
|
*
|
14
15
|
* @description
|
15
16
|
* Provides the functionality for the host collection add content hosts pane.
|
16
17
|
*/
|
17
18
|
angular.module('Bastion.host-collections').controller('HostCollectionAddHostsController',
|
18
|
-
['$scope', '$state', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection', 'Notification',
|
19
|
-
function ($scope, $state, $location, translate, Nutupane, CurrentOrganization, Host, HostCollection, Notification) {
|
19
|
+
['$scope', '$state', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection', 'Notification', 'newHostDetailsUI',
|
20
|
+
function ($scope, $state, $location, translate, Nutupane, CurrentOrganization, Host, HostCollection, Notification, newHostDetailsUI) {
|
20
21
|
var contentNutupane, params, nutupaneParams;
|
21
22
|
|
22
23
|
params = {
|
@@ -46,6 +47,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddHostsCon
|
|
46
47
|
$scope.table = contentNutupane.table;
|
47
48
|
$scope.isAdding = false;
|
48
49
|
$scope.table.closeItem = function () {};
|
50
|
+
$scope.newHostDetailsUI = newHostDetailsUI;
|
49
51
|
|
50
52
|
$scope.disableAddButton = function () {
|
51
53
|
return $scope.table.numSelected === 0 || $scope.isAdding;
|
@@ -10,13 +10,14 @@
|
|
10
10
|
* @requires CurrentOrganization
|
11
11
|
* @requires Host
|
12
12
|
* @requires HostCollection
|
13
|
+
* @requires newHostDetailsUI
|
13
14
|
*
|
14
15
|
* @description
|
15
16
|
* Provides the functionality for the host collection details action pane.
|
16
17
|
*/
|
17
18
|
angular.module('Bastion.host-collections').controller('HostCollectionHostsController',
|
18
|
-
['$scope', '$location', 'Notification', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection',
|
19
|
-
function ($scope, $location, Notification, translate, Nutupane, CurrentOrganization, Host, HostCollection) {
|
19
|
+
['$scope', '$location', 'Notification', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection', 'newHostDetailsUI',
|
20
|
+
function ($scope, $location, Notification, translate, Nutupane, CurrentOrganization, Host, HostCollection, newHostDetailsUI) {
|
20
21
|
var params, nutupaneParams;
|
21
22
|
|
22
23
|
params = {
|
@@ -46,6 +47,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionHostsContro
|
|
46
47
|
$scope.table = $scope.contentNutupane.table;
|
47
48
|
$scope.table.closeItem = function () {};
|
48
49
|
$scope.isRemoving = false;
|
50
|
+
$scope.newHostDetailsUI = newHostDetailsUI;
|
49
51
|
$scope.contentNutupane.setSearchKey('contentHostSearch');
|
50
52
|
$scope.contentNutupane.refresh();
|
51
53
|
|
@@ -39,9 +39,10 @@
|
|
39
39
|
ng-change="itemSelected(host)"/>
|
40
40
|
</td>
|
41
41
|
<td bst-table-cell >
|
42
|
-
<
|
43
|
-
{{ host.name}}
|
44
|
-
|
42
|
+
<span ng-switch="newHostDetailsUI">
|
43
|
+
<a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.name }}</a>
|
44
|
+
<a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
|
45
|
+
</span>
|
45
46
|
</td>
|
46
47
|
<td bst-table-cell >{{ host.content_facet_attributes.lifecycle_environment.name}}</td>
|
47
48
|
<td bst-table-cell >{{ host.content_facet_attributes.content_view.name}}</td>
|
@@ -39,9 +39,10 @@
|
|
39
39
|
ng-change="itemSelected(host)"/>
|
40
40
|
</td>
|
41
41
|
<td bst-table-cell >
|
42
|
-
<
|
43
|
-
{{ host.name}}
|
44
|
-
|
42
|
+
<span ng-switch="newHostDetailsUI">
|
43
|
+
<a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.name }}</a>
|
44
|
+
<a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
|
45
|
+
</span>
|
45
46
|
</td>
|
46
47
|
<td bst-table-cell >{{ host.content_facet_attributes.lifecycle_environment.name}}</td>
|
47
48
|
<td bst-table-cell >{{ host.content_facet_attributes.content_view.name}}</td>
|