katello 3.5.0.rc1 → 3.5.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/assets/javascripts/katello/containers/container.js +6 -6
- data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js +2 -1
- data/app/assets/javascripts/katello/sync_management/sync_management.js +8 -6
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +23 -16
- data/app/controllers/katello/api/v2/api_controller.rb +7 -2
- data/app/controllers/katello/api/v2/capsule_content_controller.rb +10 -2
- data/app/controllers/katello/api/v2/content_uploads_controller.rb +5 -5
- data/app/controllers/katello/api/v2/content_view_components_controller.rb +9 -9
- data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb +14 -16
- data/app/controllers/katello/api/v2/content_view_filters_controller.rb +8 -8
- data/app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb +7 -7
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +12 -12
- data/app/controllers/katello/api/v2/content_views_controller.rb +5 -5
- data/app/controllers/katello/api/v2/errata_controller.rb +2 -2
- data/app/controllers/katello/api/v2/gpg_keys_controller.rb +2 -2
- data/app/controllers/katello/api/v2/host_collections_controller.rb +7 -7
- data/app/controllers/katello/api/v2/host_errata_controller.rb +4 -4
- data/app/controllers/katello/api/v2/host_packages_controller.rb +5 -5
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +9 -4
- data/app/controllers/katello/api/v2/host_tracer_controller.rb +1 -1
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +9 -1
- data/app/controllers/katello/api/v2/organizations_controller.rb +17 -3
- data/app/controllers/katello/api/v2/packages_controller.rb +2 -2
- data/app/controllers/katello/api/v2/products_controller.rb +3 -3
- data/app/controllers/katello/api/v2/repositories_controller.rb +11 -11
- data/app/controllers/katello/api/v2/repository_sets_controller.rb +1 -10
- data/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb +1 -1
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +3 -3
- data/app/helpers/katello/providers_helper.rb +4 -1
- data/app/lib/actions/candlepin/abstract.rb +1 -0
- data/app/lib/actions/katello/host/hypervisors_update.rb +1 -0
- data/app/lib/actions/katello/host/update_release_version.rb +29 -0
- data/app/lib/actions/katello/product/create.rb +3 -6
- data/app/lib/actions/katello/product/reindex_subscriptions.rb +1 -1
- data/app/lib/actions/katello/repository/scheduled_sync.rb +15 -0
- data/app/lib/actions/katello/repository/upload_files.rb +4 -0
- data/app/lib/actions/middleware/keep_session_id.rb +29 -0
- data/app/lib/katello/resources/candlepin.rb +22 -5
- data/app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb +30 -0
- data/app/models/katello/activation_key.rb +3 -33
- data/app/models/katello/candlepin/product_content.rb +1 -14
- data/app/models/katello/concerns/content_facet_host_extensions.rb +5 -1
- data/app/models/katello/concerns/content_view_filter_rule_common.rb +13 -0
- data/app/models/katello/concerns/hostgroup_extensions.rb +1 -0
- data/app/models/katello/concerns/subscription_facet_host_extensions.rb +2 -1
- data/app/models/katello/content_view_docker_filter_rule.rb +2 -1
- data/app/models/katello/content_view_erratum_filter_rule.rb +2 -1
- data/app/models/katello/content_view_package_filter_rule.rb +2 -1
- data/app/models/katello/content_view_package_group_filter_rule.rb +2 -1
- data/app/models/katello/erratum.rb +4 -5
- data/app/models/katello/glue/candlepin/owner.rb +32 -0
- data/app/models/katello/glue/pulp/repos.rb +1 -1
- data/app/models/katello/host/subscription_facet.rb +16 -0
- data/app/models/katello/repository.rb +2 -2
- data/app/models/katello/subscription.rb +4 -1
- data/app/models/katello/subscription_status.rb +8 -4
- data/app/presenters/katello/product_content_presenter.rb +7 -2
- data/app/services/katello/candlepin/consumer.rb +0 -28
- data/app/services/katello/product_content_finder.rb +37 -0
- data/app/views/foreman/smart_proxies/_content_sync.html.erb +0 -2
- data/app/views/katello/api/v2/activation_keys/base.json.rabl +34 -0
- data/app/views/katello/api/v2/activation_keys/index.json.rabl +4 -1
- data/app/views/katello/api/v2/activation_keys/product_content.json.rabl +3 -3
- data/app/views/katello/api/v2/activation_keys/show.json.rabl +2 -38
- data/app/views/katello/api/v2/common/releases.json.rabl +7 -0
- data/config/routes/api/v2.rb +1 -0
- data/config/routes/overrides.rb +1 -0
- data/db/migrate/20171010170443_add_index_to_katello_content_facet_errata.rb +5 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-key.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-host-collections.controller.js +8 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-copy.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js +7 -10
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-host-collections.controller.js +7 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-host-collections-table.html +1 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +7 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsules/capsule.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/api-error-handler.service.js +6 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-environment-modal.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-host-collections-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-release-version-modal.controller.js +62 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html +56 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js +11 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js +10 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js +6 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-traces.controller.js +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-base-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js +8 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js +10 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +6 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-view.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-deletion.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-confirm.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-component.factory.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-promotion.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-publish.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-versions.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-errata-filter.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-package-group-filter.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js +11 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/docker-tag-filter.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/edit-filter.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/errata-filter-list.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-repositories.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filters.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-group-list-filter.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/rule.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-versions.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-modules.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifest.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-details.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment.controller.js +5 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environment.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/new-environment.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/new-environment.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js +9 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum-content-hosts.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/erratum.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/file.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/gpg-key-details-info.controller.js +6 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/gpg-key-details.controller.js +4 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-key.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/new-gpg-key.controller.js +6 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-copy.controller.js +3 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js +13 -22
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-hosts.controller.js +6 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/host-collection.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-erratum.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organization.factory.js +7 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branch.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/package-groups/package-group.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/package.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/product-bulk-action.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-sync-plan-modal.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details-info.controller.js +5 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js +6 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js +15 -14
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-advanced-sync.controller.js +6 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +9 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js +7 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-files.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ostree-branches.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-packages.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-puppet-modules.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +5 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository.factory.js +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html +0 -20
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-info.html +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js +4 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js +5 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-base.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/product-form.controller.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/product.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.controller.js +7 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/puppet-module.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-module.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-set.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/setting.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js +0 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-details.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-import.controller.js +9 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.factory.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-add-products.controller.js +6 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details-info.controller.js +5 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details.controller.js +5 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-products.controller.js +8 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-products.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/new-sync-plan.controller.js +4 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plan.factory.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task.factory.js +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks.module.js +3 -3
- data/lib/katello/permission_creator.rb +3 -2
- data/lib/katello/permissions/host_permissions.rb +1 -0
- data/lib/katello/permissions/organization_permissions.rb +1 -0
- data/lib/katello/tasks/clean_installed_packages.rake +20 -3
- data/lib/katello/version.rb +1 -1
- metadata +17 -6
@@ -9,13 +9,14 @@
|
|
9
9
|
* @requires Subscription
|
10
10
|
* @requires ContentHost
|
11
11
|
* @requires SubscriptionsHelper
|
12
|
+
* @requires Notification
|
12
13
|
*
|
13
14
|
* @description
|
14
15
|
* Provides the functionality for the content host details action pane.
|
15
16
|
*/
|
16
17
|
angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsController',
|
17
|
-
['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostSubscription', 'Subscription', 'SubscriptionsHelper',
|
18
|
-
function ($scope, $location, translate, Nutupane, CurrentOrganization, Host, HostSubscription, Subscription, SubscriptionsHelper) {
|
18
|
+
['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostSubscription', 'Subscription', 'SubscriptionsHelper', 'Notification',
|
19
|
+
function ($scope, $location, translate, Nutupane, CurrentOrganization, Host, HostSubscription, Subscription, SubscriptionsHelper, Notification) {
|
19
20
|
|
20
21
|
var params = {
|
21
22
|
'organization_id': CurrentOrganization,
|
@@ -63,12 +64,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
|
|
63
64
|
HostSubscription.addSubscriptions({id: $scope.$stateParams.hostId, 'subscriptions': selected}, function () {
|
64
65
|
Host.get({id: $scope.$stateParams.hostId}, function (host) {
|
65
66
|
$scope.$parent.host = host;
|
66
|
-
|
67
|
+
Notification.setSuccessMessage(translate("Successfully added %s subscriptions.").replace('%s', selected.length));
|
67
68
|
$scope.isAdding = false;
|
68
69
|
$scope.nutupane.refresh();
|
69
70
|
});
|
70
71
|
}, function (response) {
|
71
|
-
|
72
|
+
Notification.setErrorMessage(response.data.displayMessage);
|
72
73
|
$scope.isAdding = false;
|
73
74
|
$scope.nutupane.refresh();
|
74
75
|
});
|
@@ -7,23 +7,24 @@
|
|
7
7
|
* @requires CurrentOrganization
|
8
8
|
* @requires Subscription
|
9
9
|
* @requires Nutupane
|
10
|
+
* @requires Notification
|
10
11
|
*
|
11
12
|
* @description
|
12
13
|
* Provides the functionality for the content host details action pane.
|
13
14
|
*/
|
14
15
|
angular.module('Bastion.content-hosts').controller('ContentHostBaseSubscriptionsController',
|
15
|
-
['$scope', '$location', 'translate', 'CurrentOrganization', 'Subscription', 'HostSubscription',
|
16
|
-
function ($scope, $location, translate, CurrentOrganization, Subscription, HostSubscription) {
|
16
|
+
['$scope', '$location', 'translate', 'CurrentOrganization', 'Subscription', 'HostSubscription', 'Notification',
|
17
|
+
function ($scope, $location, translate, CurrentOrganization, Subscription, HostSubscription, Notification) {
|
17
18
|
|
18
19
|
function success() {
|
19
20
|
$scope.subscription.workingMode = false;
|
20
|
-
|
21
|
+
Notification.setSuccessMessage(translate('Successfully updated subscriptions.'));
|
21
22
|
$scope.host.$get();
|
22
23
|
}
|
23
24
|
|
24
25
|
function failure() {
|
25
26
|
$scope.subscription.workingMode = false;
|
26
|
-
|
27
|
+
Notification.setErrorMessage(translate('An error occurred trying to auto-attach subscriptions. Please check your log for further information.'));
|
27
28
|
}
|
28
29
|
|
29
30
|
$scope.subscription = {
|
@@ -41,9 +41,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
|
|
41
41
|
}
|
42
42
|
});
|
43
43
|
|
44
|
-
$scope.successMessages = [];
|
45
|
-
$scope.errorMessages = [];
|
46
|
-
|
47
44
|
$scope.showVersionAlert = false;
|
48
45
|
$scope.editContentView = false;
|
49
46
|
$scope.disableEnvironmentSelection = false;
|
@@ -15,11 +15,10 @@
|
|
15
15
|
* Provides the functionality for the content host details action pane.
|
16
16
|
*/
|
17
17
|
angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
|
18
|
-
['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', '
|
19
|
-
function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization,
|
18
|
+
['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler',
|
19
|
+
function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler) {
|
20
20
|
$scope.menuExpander = MenuExpander;
|
21
|
-
|
22
|
-
$scope.errorMessages = [];
|
21
|
+
|
23
22
|
$scope.panel = {
|
24
23
|
error: false,
|
25
24
|
loading: true
|
@@ -85,11 +84,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
|
|
85
84
|
Host.update({id: host.id, host: whitelistedHostObject}, function (response) {
|
86
85
|
deferred.resolve(response);
|
87
86
|
$scope.host = response;
|
88
|
-
|
87
|
+
Notification.setSuccessMessage(translate('Save Successful.'));
|
89
88
|
}, function (response) {
|
90
89
|
deferred.reject(response);
|
91
90
|
_.each(response.data.error.full_messages, function (errorMessage) {
|
92
|
-
|
91
|
+
Notification.setErrorMessage(translate("An error occurred saving the Content Host: ") + errorMessage);
|
93
92
|
});
|
94
93
|
});
|
95
94
|
// @TODO end hack
|
@@ -126,20 +125,20 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
|
|
126
125
|
$scope.unregisterContentHost = function (host) {
|
127
126
|
var errorHandler = function (response) {
|
128
127
|
host.deleting = false;
|
129
|
-
|
128
|
+
Notification.setErrorMessage(translate('An error occured: %s').replace('%s', response.data.displayMessage));
|
130
129
|
};
|
131
130
|
host.deleting = true;
|
132
131
|
|
133
132
|
if (host.unregisterDelete) {
|
134
133
|
host.$delete(function () {
|
135
134
|
host.deleting = false;
|
136
|
-
|
135
|
+
Notification.setSuccessMessage(translate('Host %s has been deleted.').replace('%s', host.name));
|
137
136
|
$scope.transitionTo('content-hosts');
|
138
137
|
}, errorHandler);
|
139
138
|
} else {
|
140
139
|
HostSubscription.delete({id: host.id}, function () {
|
141
140
|
host.deleting = false;
|
142
|
-
|
141
|
+
Notification.setSuccessMessage(translate('Host %s has been unregistered.').replace('%s', host.name));
|
143
142
|
$scope.transitionTo('content-hosts');
|
144
143
|
}, errorHandler);
|
145
144
|
}
|
@@ -10,13 +10,14 @@
|
|
10
10
|
* @requires Host
|
11
11
|
* @requires CurrentOrganization
|
12
12
|
* @requires Nutupane
|
13
|
+
* @requires Notification
|
13
14
|
*
|
14
15
|
* @description
|
15
16
|
* Provides the functionality for the list host collections details action pane.
|
16
17
|
*/
|
17
18
|
angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsController',
|
18
|
-
['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane',
|
19
|
-
function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane) {
|
19
|
+
['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane', 'Notification',
|
20
|
+
function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane, Notification) {
|
20
21
|
var nutupane, params;
|
21
22
|
|
22
23
|
params = {
|
@@ -34,9 +35,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
|
|
34
35
|
|
35
36
|
$scope.table = nutupane.table;
|
36
37
|
|
37
|
-
$scope.successMessages = [];
|
38
|
-
$scope.errorMessages = [];
|
39
|
-
|
40
38
|
$scope.removeHostCollections = function (host) {
|
41
39
|
var deferred = $q.defer(),
|
42
40
|
success,
|
@@ -46,8 +44,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
|
|
46
44
|
hostCollectionsToRemove;
|
47
45
|
|
48
46
|
success = function (response) {
|
49
|
-
|
50
|
-
.replace('%x', $scope.table.numSelected).replace('%y', host.name)
|
47
|
+
var message = translate('Removed %x host collections from content host "%y".')
|
48
|
+
.replace('%x', $scope.table.numSelected).replace('%y', host.name);
|
49
|
+
|
50
|
+
Notification.setSuccessMessage(message);
|
51
51
|
$scope.table.working = false;
|
52
52
|
$scope.table.selectAll(false);
|
53
53
|
nutupane.refresh();
|
@@ -57,7 +57,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
|
|
57
57
|
|
58
58
|
error = function (response) {
|
59
59
|
deferred.reject(response.data.errors);
|
60
|
-
|
60
|
+
angular.forEach(response.data.errors, function (responseError) {
|
61
|
+
Notification.setErrorMessage(responseError);
|
62
|
+
});
|
61
63
|
$scope.table.working = false;
|
62
64
|
};
|
63
65
|
|
@@ -7,15 +7,15 @@
|
|
7
7
|
* @requires Nutupane
|
8
8
|
* @requires HostSubscription
|
9
9
|
* @requires ContentOverrideHelper
|
10
|
-
* @requires
|
10
|
+
* @requires Notification
|
11
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', 'ContentOverrideHelper', '
|
18
|
-
function ($scope, translate, Nutupane, HostSubscription, ContentOverrideHelper,
|
17
|
+
['$scope', 'translate', 'Nutupane', 'HostSubscription', 'ContentOverrideHelper', 'Notification', 'CurrentOrganization',
|
18
|
+
function ($scope, translate, Nutupane, HostSubscription, ContentOverrideHelper, Notification, CurrentOrganization) {
|
19
19
|
var params, saveContentOverride, success, error;
|
20
20
|
|
21
21
|
params = {
|
@@ -42,13 +42,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsCon
|
|
42
42
|
|
43
43
|
success = function () {
|
44
44
|
$scope.table.working = false;
|
45
|
-
|
45
|
+
Notification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));
|
46
46
|
$scope.nutupane.refresh();
|
47
47
|
};
|
48
48
|
|
49
49
|
error = function (response) {
|
50
50
|
$scope.table.working = false;
|
51
|
-
|
51
|
+
Notification.setErrorMessage(response.data.errors);
|
52
52
|
};
|
53
53
|
|
54
54
|
saveContentOverride = function (contentOverrides) {
|
@@ -7,13 +7,14 @@
|
|
7
7
|
* @requires translate
|
8
8
|
* @requires Subscription
|
9
9
|
* @requires SubscriptionsHelper
|
10
|
+
* @requires Notification
|
10
11
|
*
|
11
12
|
* @description
|
12
13
|
* Provides the functionality for the content host details action pane.
|
13
14
|
*/
|
14
15
|
angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsController',
|
15
|
-
['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper',
|
16
|
-
function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper) {
|
16
|
+
['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper', 'Notification',
|
17
|
+
function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper, Notification) {
|
17
18
|
|
18
19
|
var params = {
|
19
20
|
'organization_id': CurrentOrganization,
|
@@ -51,12 +52,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
|
|
51
52
|
$scope.$parent.host = host;
|
52
53
|
$scope.nutupane.table.selectAll(false);
|
53
54
|
$scope.nutupane.refresh();
|
54
|
-
|
55
|
+
Notification.setSuccessMessage(translate("Successfully removed %s subscriptions.").replace('%s', selected.length));
|
55
56
|
$scope.isRemoving = false;
|
56
57
|
});
|
57
58
|
}, function (response) {
|
58
59
|
$scope.isRemoving = false;
|
59
|
-
|
60
|
+
Notification.setErrorMessage(translate("An error occurred removing the subscriptions.") + response.data.displayMessage);
|
60
61
|
});
|
61
62
|
};
|
62
63
|
}
|
@@ -9,8 +9,6 @@
|
|
9
9
|
{{ "Changing default settings requires subscription-manager version 1.10 or newer to be installed on this host." | translate }}
|
10
10
|
</div>
|
11
11
|
|
12
|
-
<div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
|
13
|
-
|
14
12
|
<div class="loading-mask loading-mask-panel" ng-show="displayArea.working">
|
15
13
|
<i class="fa fa-spinner fa-spin"></i>
|
16
14
|
<span translate>Loading..."</span>
|
@@ -1,3 +1,5 @@
|
|
1
|
+
<span page-title>{{ 'Content Hosts' | translate }}</span>
|
2
|
+
|
1
3
|
<div data-extend-template="layouts/table-with-header.html">
|
2
4
|
|
3
5
|
<div data-block="header">
|
@@ -33,6 +35,10 @@
|
|
33
35
|
<a ng-click="openEnvironmentModal()" disable-link="table.numSelected === 0" translate>Change Lifecycle Environment</a>
|
34
36
|
</li>
|
35
37
|
|
38
|
+
<li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
|
39
|
+
<a ng-click="openSetReleaseVersionModal()" disable-link="table.numSelected === 0" translate>Set Release Version</a>
|
40
|
+
</li>
|
41
|
+
|
36
42
|
<li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
|
37
43
|
<a ng-click="openSubscriptionsModal()" disable-link="table.numSelected === 0" translate>Manage Subscriptions</a>
|
38
44
|
</li>
|
@@ -13,7 +13,7 @@ angular.module('Bastion.content-views').factory('ContentView',
|
|
13
13
|
['BastionResource', 'translate', 'CurrentOrganization',
|
14
14
|
function (BastionResource, translate, CurrentOrganization) {
|
15
15
|
|
16
|
-
return BastionResource('
|
16
|
+
return BastionResource('katello/api/v2/content_views/:id/:action',
|
17
17
|
{id: '@id', 'organization_id': CurrentOrganization},
|
18
18
|
{
|
19
19
|
copy: {method: 'POST', params: {action: 'copy'}},
|
@@ -4,13 +4,13 @@
|
|
4
4
|
*
|
5
5
|
* @requires $scope
|
6
6
|
* @requires ContentView
|
7
|
-
* @requires
|
7
|
+
* @requires Notification
|
8
8
|
*
|
9
9
|
* @description
|
10
10
|
* Provides the functionality for deleting Content Views
|
11
11
|
*/
|
12
12
|
angular.module('Bastion.content-views').controller('ContentViewDeletionController',
|
13
|
-
['$scope', 'ContentView', '
|
13
|
+
['$scope', 'ContentView', 'Notification', function ($scope, ContentView, Notification) {
|
14
14
|
|
15
15
|
function success() {
|
16
16
|
$scope.transitionTo('content-views');
|
@@ -18,7 +18,7 @@ angular.module('Bastion.content-views').controller('ContentViewDeletionControlle
|
|
18
18
|
}
|
19
19
|
|
20
20
|
function failure(response) {
|
21
|
-
|
21
|
+
Notification.setErrorMessage(response.data.displayMessage);
|
22
22
|
$scope.working = false;
|
23
23
|
}
|
24
24
|
|
@@ -5,15 +5,15 @@
|
|
5
5
|
* @requires $scope
|
6
6
|
* @requires ContentView
|
7
7
|
* @requires translate
|
8
|
-
* @requires
|
8
|
+
* @requires Notification
|
9
9
|
*
|
10
10
|
* @description
|
11
11
|
* Provides the confirmation and submit code for the content view version deletion
|
12
12
|
* workflow
|
13
13
|
*/
|
14
14
|
angular.module('Bastion.content-views').controller('ContentViewVersionDeletionConfirmController',
|
15
|
-
['$scope', 'ContentView', 'translate', '
|
16
|
-
function ($scope, ContentView, translate,
|
15
|
+
['$scope', 'ContentView', 'translate', 'Notification',
|
16
|
+
function ($scope, ContentView, translate, Notification) {
|
17
17
|
|
18
18
|
function success() {
|
19
19
|
var message = translate('Successfully initiated removal of %cv version %ver.');
|
@@ -23,14 +23,14 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
|
|
23
23
|
}
|
24
24
|
|
25
25
|
message = message.replace('%cv', $scope.contentView.name).replace('%ver', $scope.version.version);
|
26
|
-
|
26
|
+
Notification.setSuccessMessage(message);
|
27
27
|
$scope.transitionTo('content-view.versions', {contentViewId: $scope.contentView.id});
|
28
28
|
}
|
29
29
|
|
30
30
|
function error(response) {
|
31
31
|
$scope.deleting = false;
|
32
32
|
angular.forEach(response.data.errors, function (responseError) {
|
33
|
-
|
33
|
+
Notification.setErrorMessage(responseError);
|
34
34
|
});
|
35
35
|
}
|
36
36
|
|
@@ -12,19 +12,19 @@ angular.module('Bastion.content-views').factory('ContentViewComponent',
|
|
12
12
|
['BastionResource', 'CurrentOrganization',
|
13
13
|
function (BastionResource, CurrentOrganization) {
|
14
14
|
|
15
|
-
return BastionResource('
|
15
|
+
return BastionResource('katello/api/v2/content_views/:compositeContentViewId/content_view_components/:id/:action',
|
16
16
|
{id: '@id', compositeContentViewId: '@compositeContentViewId', 'organization_id': CurrentOrganization},
|
17
17
|
{
|
18
18
|
update: {method: 'PUT'},
|
19
19
|
removeComponents: {
|
20
20
|
method: 'PUT',
|
21
21
|
isArray: false,
|
22
|
-
url: '
|
22
|
+
url: 'katello/api/v2/content_views/:compositeContentViewId/content_view_components/remove'
|
23
23
|
},
|
24
24
|
addComponents: {
|
25
25
|
method: 'PUT',
|
26
26
|
isArray: false,
|
27
|
-
url: '
|
27
|
+
url: 'katello/api/v2/content_views/:compositeContentViewId/content_view_components/add'
|
28
28
|
}
|
29
29
|
}
|
30
30
|
);
|
@@ -7,21 +7,21 @@
|
|
7
7
|
* @requires ContentView
|
8
8
|
* @requires translate
|
9
9
|
* @requires ApiErrorHandler
|
10
|
-
* @requires
|
10
|
+
* @requires Notification
|
11
11
|
*
|
12
12
|
* @description
|
13
13
|
* Provides the functionality specific to the Content View Details page.
|
14
14
|
*/
|
15
15
|
angular.module('Bastion.content-views').controller('ContentViewDetailsController',
|
16
|
-
['$scope', '$q', 'ContentView', 'translate', 'ApiErrorHandler', '
|
17
|
-
function ($scope, $q, ContentView, translate, ApiErrorHandler,
|
16
|
+
['$scope', '$q', 'ContentView', 'translate', 'ApiErrorHandler', 'Notification',
|
17
|
+
function ($scope, $q, ContentView, translate, ApiErrorHandler, Notification) {
|
18
18
|
$scope.saveSuccess = function () {
|
19
|
-
|
19
|
+
Notification.setSuccessMessage(translate('Content View updated.'));
|
20
20
|
};
|
21
21
|
|
22
22
|
$scope.saveError = function (response) {
|
23
23
|
angular.forEach(response.data.errors, function (errorMessage) {
|
24
|
-
|
24
|
+
Notification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
|
25
25
|
});
|
26
26
|
};
|
27
27
|
|
@@ -49,7 +49,7 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
|
|
49
49
|
ContentView.copy({id: $scope.contentView.id, 'content_view': {name: newName}}, function (response) {
|
50
50
|
$scope.transitionTo('content-view.info', {contentViewId: response.id});
|
51
51
|
}, function (response) {
|
52
|
-
|
52
|
+
Notification.setErrorMessage(response.data.displayMessage);
|
53
53
|
});
|
54
54
|
};
|
55
55
|
|
@@ -8,7 +8,7 @@
|
|
8
8
|
* @requires ContentViewVersion
|
9
9
|
* @requires Organization
|
10
10
|
* @requires CurrentOrganization
|
11
|
-
* @requires
|
11
|
+
* @requires Notification
|
12
12
|
*
|
13
13
|
* @description
|
14
14
|
* Provides the functionality specific to ContentViews for use with the Nutupane UI pattern.
|
@@ -16,21 +16,21 @@
|
|
16
16
|
* within the table.
|
17
17
|
*/
|
18
18
|
angular.module('Bastion.content-views').controller('ContentViewPromotionController',
|
19
|
-
['$scope', '$q', 'translate', 'ContentViewVersion', 'Organization', 'CurrentOrganization', '
|
20
|
-
function ($scope, $q, translate, ContentViewVersion, Organization, CurrentOrganization,
|
19
|
+
['$scope', '$q', 'translate', 'ContentViewVersion', 'Organization', 'CurrentOrganization', 'Notification',
|
20
|
+
function ($scope, $q, translate, ContentViewVersion, Organization, CurrentOrganization, Notification) {
|
21
21
|
|
22
22
|
function success() {
|
23
23
|
var message = translate('Successfully initiated promotion of %cv version %ver to %env.');
|
24
24
|
message = message.replace('%cv', $scope.contentView.name).replace('%env', $scope.selectedEnvironment.name);
|
25
25
|
message = message.replace('%ver', $scope.version.version);
|
26
26
|
$scope.promoting = false;
|
27
|
-
|
27
|
+
Notification.setSuccessMessage(message);
|
28
28
|
$scope.transitionTo('content-view.versions', {contentViewId: $scope.contentView.id});
|
29
29
|
}
|
30
30
|
|
31
31
|
function failure(response) {
|
32
32
|
$scope.promoting = false;
|
33
|
-
|
33
|
+
Notification.setErrorMessage(response.data.displayMessage);
|
34
34
|
}
|
35
35
|
|
36
36
|
$scope.promotion = {};
|
@@ -5,7 +5,7 @@
|
|
5
5
|
* @requires $scope
|
6
6
|
* @requires translate
|
7
7
|
* @requires ContentView
|
8
|
-
* @requires
|
8
|
+
* @requires Notification
|
9
9
|
*
|
10
10
|
* @description
|
11
11
|
* Provides the functionality specific to ContentViews for use with the Nutupane UI pattern.
|
@@ -13,7 +13,7 @@
|
|
13
13
|
* within the table.
|
14
14
|
*/
|
15
15
|
angular.module('Bastion.content-views').controller('ContentViewPublishController',
|
16
|
-
['$scope', 'translate', 'ContentView', '
|
16
|
+
['$scope', 'translate', 'ContentView', 'Notification', function ($scope, translate, ContentView, Notification) {
|
17
17
|
|
18
18
|
function success() {
|
19
19
|
$scope.transitionTo('content-view.versions',
|
@@ -26,7 +26,7 @@ angular.module('Bastion.content-views').controller('ContentViewPublishController
|
|
26
26
|
}
|
27
27
|
|
28
28
|
function failure(response) {
|
29
|
-
|
29
|
+
Notification.setErrorMessage(response.data.displayMessage);
|
30
30
|
$scope.working = false;
|
31
31
|
}
|
32
32
|
|