katello 4.4.2.2 → 4.5.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -398,6 +398,14 @@ msgid_plural "{{ product.sync_summary.success}} successfully synced repositories
 msgstr[0] ""
 msgstr[1] ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "A comma-separated list of container image tags to exclude when syncing. Source images are excluded by default because they are often large and unwanted."
+msgstr ""
+
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "A comma-separated list of container image tags to include when syncing."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html
 msgid "A composite view contains other content views."
 msgstr ""
@@ -888,6 +896,7 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-deb.html
 #: app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html
 #: app/assets/javascripts/bastion_katello/debs/views/debs.html
+#: app/assets/javascripts/bastion_katello/environments/details/views/environment-debs.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-debs.html
 msgid "Architecture"
@@ -967,7 +976,7 @@ msgid "Are you sure you want to remove product \"{{ product.name }}\"?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html
-msgid "Are you sure you want to remove repository {{ repositoryWrapper.repository.name }}?"
+msgid "Are you sure you want to remove repository {{ repositoryWrapper.repository.name }} from all content views?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-details.html
@@ -1221,6 +1230,7 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html
 #: app/assets/javascripts/bastion_katello/errata/views/apply-errata-select-content-hosts.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync.html
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html
 #: app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html
 msgid "Cancel"
 msgstr ""
@@ -1578,6 +1588,7 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/activation-keys/views/activation-keys.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 #: app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
+#: app/assets/javascripts/bastion_katello/environments/details/views/environment-deb-repositories.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-repositories.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment.html
 #: app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html
@@ -1840,13 +1851,22 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
 #: app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version.html
 #: app/assets/javascripts/bastion_katello/debs/views/debs.html
+#: app/assets/javascripts/bastion_katello/environments/content.service.js
 msgid "Deb Packages"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/environments/views/environments.html
+msgid "Deb Packages <div>{{ library.counts.debs || 0 }}</div>"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html
 msgid "Deb Packages for:"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/environments/views/environments.html
+msgid "Deb Repositories <div>{{ library.counts.deb_repositories || 0 }}</div>"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html
 #: app/assets/javascripts/bastion_katello/debs/details/views/deb.html
 msgid "Deb:"
@@ -1860,6 +1880,10 @@ msgstr ""
 msgid "Default Status"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html
+msgid "Delete"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html
 msgid "Delete {{ table.numSelected  }} Hosts?"
 msgstr ""
@@ -2044,10 +2068,6 @@ msgstr ""
 msgid "Docker Repositories"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/environments/views/environments.html
-msgid "Docker Repositories <div>{{ library.counts.docker_repositories || 0 }}</div>"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html
 msgid "Docker Repository Selection"
 msgstr ""
@@ -2263,6 +2283,11 @@ msgstr ""
 msgid "Exclude all RPMs with no errata."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "Exclude Tags"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html
 msgid "Existing Product"
 msgstr ""
@@ -2632,6 +2657,11 @@ msgstr ""
 msgid "Include all RPMs with no errata."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "Include Tags"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/views/filters.html
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/views/new-filter.html
 msgid "Inclusion Type"
@@ -2778,6 +2808,10 @@ msgstr ""
 msgid "Last Puppet Report"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js
+msgid "Last reclaim space failed:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-deb-repositories.html
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-file-repositories.html
@@ -2792,6 +2826,10 @@ msgstr ""
 msgid "Last Sync"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js
+msgid "Last sync failed:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/views/partials/product-table-sync-status.html
 msgid "Last synced"
 msgstr ""
@@ -2877,10 +2915,6 @@ msgstr ""
 msgid "Limit Repository Sets to only those available in this Host's Lifecycle Environment"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
-msgid "Limit Sync Tags"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html
 msgid "Limit to environment"
 msgstr ""
@@ -3153,6 +3187,8 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/debs/views/debs.html
 #: app/assets/javascripts/bastion_katello/docker-tags/views/docker-tags.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html
+#: app/assets/javascripts/bastion_katello/environments/details/views/environment-deb-repositories.html
+#: app/assets/javascripts/bastion_katello/environments/details/views/environment-debs.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-details.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-docker.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-module-streams.html
@@ -3391,7 +3427,7 @@ msgid "No products are available to add to this Sync Plan."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-products.html
-msgid "No products are have been added to this Sync Plan."
+msgid "No products have been added to this Sync Plan."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html
@@ -3810,6 +3846,7 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-yum.html
 #: app/assets/javascripts/bastion_katello/debs/details/views/deb-repositories.html
 #: app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-info.html
+#: app/assets/javascripts/bastion_katello/environments/details/views/environment-deb-repositories.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-docker.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-repositories.html
 #: app/assets/javascripts/bastion_katello/errata/details/views/erratum-repositories.html
@@ -3975,6 +4012,11 @@ msgstr ""
 msgid "Publishing and promoting to 1 environment."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "Publishing Settings"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html
 msgid "Puppet Environment"
 msgstr ""
@@ -4087,9 +4129,6 @@ msgid "Release Version:"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
-msgid "Releases"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 msgid "Releases/Distributions"
 msgstr ""
@@ -4653,10 +4692,6 @@ msgstr ""
 msgid "Selecting this option will result in the Version being completely deleted and no longer being available for promotion.  The version must be removed from all Lifecycle Environments in order to select this option."
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html
-msgid "Serve via HTTP"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html
@@ -5188,6 +5223,7 @@ msgid "The Remote Execution plugin needs to be installed in order to resolve Tra
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 msgid "The repository will be enabled by default on content hosts with the selected architecture."
 msgstr ""
 
@@ -5365,6 +5401,10 @@ msgstr ""
 msgid "This organization has Simple Content Access enabled.  Hosts are not required to have subscriptions attached to access repositories."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
+msgid "This organization is not using <a target=\"_blank\" href=\"https://access.redhat.com/articles/simple-content-access\">Simple Content Access.</a> Legacy subscription management is deprecated and will be removed in a future version."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-environments.html
 msgid "This Version cannot be deleted from some of the Lifecycle Environments due to one of the reasons below."
 msgstr ""
@@ -5434,6 +5474,10 @@ msgstr ""
 msgid "Traces for:"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html
+msgid "Turn on Setting > Content > Allow deleting repositories in published content views"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html
 #: app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-info.html
 #: app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-repositories.html
@@ -5481,6 +5525,7 @@ msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+#: app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html
 msgid "Unprotected"
 msgstr ""
 
@@ -5725,6 +5770,7 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/debs/details/views/deb-content-views.html
 #: app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html
 #: app/assets/javascripts/bastion_katello/debs/views/debs.html
+#: app/assets/javascripts/bastion_katello/environments/details/views/environment-debs.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-module-streams.html
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-packages.html
 #: app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -89,7 +89,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 return deferred.promise;
             };
 
-            $scope.save = function (repository, saveUpstreamAuth) {
+            $scope.save = function (repository) {
                 var deferred = $q.defer();
                 var fields = ['upstream_password', 'upstream_username', 'upstream_authentication_token', 'ansible_collection_auth_token', 'ansible_collection_auth_url', 'ansible_collection_requirements'];
                 if (repository.content_type === 'yum' && typeof repository.ignore_srpms !== 'undefined') {
@@ -99,13 +99,6 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                         repository['ignorable_content'] = [];
                     }
                 }
-
-                if (!saveUpstreamAuth) {
-                    repository['upstream_username'] = null;
-                    repository['upstream_password'] = null;
-                    repository['upstream_authentication_token'] = null;
-                }
-
                 if ($scope.genericRemoteOptions && $scope.genericRemoteOptions !== []) {
                     $scope.genericRemoteOptions.forEach(function(option) {
                        if (option.type === "Array") {
@@ -141,6 +134,9 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                         repository[field] = null;
                     }
                 });
+                if (!repository['upstream_username']) {
+                    repository['upstream_password'] = null;
+                }
                 repository.os_versions = $scope.osVersionsParam();
                 repository.$update(function (response) {
                     deferred.resolve(response);
@@ -246,6 +242,9 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 $scope.genericRemoteOptions = RepositoryTypesService.getAttribute($scope.repository, "generic_remote_options");
                 if ($scope.genericRemoteOptions && $scope.genericRemoteOptions !== []) {
                     remOptions = angular.fromJson($scope.repository.generic_remote_options);
+                    if (remOptions === null) {
+                        return null;
+                    }
                     Object.keys(remOptions).forEach(function(key) {
                         if (remOptions[key]) {
                             optionIndex = $scope.genericRemoteOptions.map(function(option) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js

@@ -39,7 +39,12 @@
 
         $scope.repositoryWrapper = {
             repository: $scope.repository,
-            repositoryVersions: {}
+            repositoryVersions: {},
+            forceDelete: false
+        };
+
+        $scope.updateForceDelete = function () {
+            $scope.repositoryWrapper.forceDelete = !($scope.repositoryWrapper.forceDelete);
         };
 
         $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
@@ -144,7 +149,11 @@
                 if ($scope.denied('deletable', repo)) {
                     readOnlyReason = 'permissions';
                 }
+                if (readOnlyReason === null && !repo.permissions.deletable_across_cv && repo.content_view_versions.length > 0 ) {
+                    readOnlyReason = 'setting';
+                }
             }
+
             return readOnlyReason;
         };
     }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html

@@ -78,6 +78,12 @@
                  tooltip-placement="left"
                  tooltip-append-to-body="true">
               </i>
+                <i class="fa fa-question-circle" ng-switch-when="setting"
+                   uib-tooltip="{{ 'Turn on Setting > Content > Allow deleting repositories in published content views' | translate }}"
+                   tooltip-animation="false"
+                   tooltip-placement="left"
+                   tooltip-append-to-body="true">
+              </i>
             </span>
           </span>
         </li>
@@ -86,7 +92,7 @@
       <div bst-modal="removeRepository(repository)" model="repositoryWrapper">
         <div data-block="modal-header" translate>Remove Repository {{ repositoryWrapper.repository.name }}?</div>
         <div data-block="modal-body">
-            <div ng-show="repositoryWrapper.repository.promoted" style="margin-bottom: 1em">
+            <div ng-show="repositoryWrapper.repository.content_view_versions.length !== 0" style="margin-bottom: 1em">
                 <span translate>Repository will also be removed from the following published content view versions!</span>
                 <table class="table table-striped table-bordered" style="margin-top: 1em">
                     <thead>
@@ -113,9 +119,21 @@
                     </tbody>
                 </table>
             </div>
-            <span translate>Are you sure you want to remove repository {{ repositoryWrapper.repository.name }}?</span>
+            <input type="checkbox"
+                   ng-show="repositoryWrapper.repository.content_view_versions.length !== 0"
+                   ng-model="repositoryWrapper.forceDelete"
+                   ng-change="updateForceDelete()"/>
+            <span translate> Are you sure you want to remove repository {{ repositoryWrapper.repository.name }} from all content views?</span>
+        </div>
+          <div data-block="modal-footer">
+            <span data-block="modal-confirm-button">
+              <button class="btn btn-danger" ng-disabled="repositoryWrapper.repository.content_view_versions.length !== 0 && !repositoryWrapper.forceDelete" ng-click="ok()">
+                <span translate>Delete</span>
+              </button>
+            </span>
+            <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>
+          </div>
         </div>
-      </div>
     </span>
   </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -63,7 +63,7 @@
       <dt ng-show="repository.content_type !== 'docker'" translate>Upstream URL</dt>
       <dt ng-show="repository.content_type === 'docker'" translate>Registry URL</dt>
       <dd bst-edit-text="repository.url"
-          on-save="save(repository, true)"
+          on-save="save(repository)"
           readonly="product.redhat || denied('edit_products', product)">
       </dd>
 
@@ -82,7 +82,7 @@
       </span>
 
       <span ng-if="repository.content_type == 'deb'">
-        <dt translate>Releases</dt>
+        <dt translate>Releases/Distributions</dt>
         <dd bst-edit-text="repository.deb_releases"
             on-save="save(repository)"
             readonly="denied('edit_products', product)">
@@ -134,7 +134,7 @@
         <dt translate>Ansible Collection Authorization</dt>
         <dd bst-edit-custom="repository.ansible_collection_auth_exists"
             readonly="denied('edit_products', product)"
-            on-save="save(repository, true)"
+            on-save="save(repository)"
             formatter="ansibleAuthFilter"
             formatter-options="repository"
             deletable="repository.ansible_collection_auth_exists"
@@ -165,7 +165,7 @@
         <dt translate>Upstream Authorization</dt>
         <dd bst-edit-custom="repository.upstream_auth_exists"
             readonly="denied('edit_products', product)"
-            on-save="save(repository, true)"
+            on-save="save(repository)"
             formatter="upstreamPasswordFilter"
             formatter-options="repository"
             deletable="repository.upstream_auth_exists"
@@ -174,18 +174,17 @@
           <input id="upstream_username"
                  name="upstream_username"
                  type="name"
-                 autocomplete="off"
                  ng-model="repository.upstream_username"/>
           <div translate>Upstream Password</div>
-          <input id="upstream_password"
+	  <input id="upstream_password"
                  name="upstream_password"
-                 type="password"
-                 autocomplete="off"
+                 type="{{ repository.upstream_password.length < 1 ? 'text': 'password' }}"
+                 autocomplete="{{ (repository.upstream_username==null || repository.upstream_username=='') ? 'new-password' : '' }}"
                  ng-model="repository.upstream_password"/>
           <div translate>Upstream Authentication Token</div>
           <input id="upstream_authentication_token"
                   name="upstream_authentication_token"
-                  type="password"
+                  type="{{ repository.upstream_authentication_token.length < 1 ? 'text': 'password' }}"
                   autocomplete="off"
                   ng-model="repository.upstream_authentication_token"/>
         </dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -196,11 +196,13 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
             $scope.debURLPopover = $sce.trustAsHtml("For standard Debian repos, this is the folder that contains the \"dists/\" and the \"pool/\" subfolders.");
 
-            $scope.distPopover = $sce.trustAsHtml("A \"distribution\" provides the path from the repository root to the \"Release\" file <br/>" +
-             "you want to access. Each distribution in the list should use /etc/apt/sources.list<br/>" +
-             "syntax. For most official Debian and Ubuntu repositories, the distribution is equal<br/>" +
-             "to either the codename or the suite. When syncing a repo using flat repository format<br/>" +
-             "specify exactly one distribution, which must end with a \"/\".");
+            $scope.distPopover = $sce.trustAsHtml("A \"distribution\" provides the path from the repository root to the \"Release\" file you want to access. Each<br/>" +
+             "distribution in the list should use /etc/apt/sources.list syntax. For most official Debian and Ubuntu repositories,<br/>" +
+             "the distribution is equal to either the codename or the suite. Upstream repos that do not contain a \"dists/\" <br>" +
+             "folder may be using the deprecated \"flat repository format\".<br>" +
+             "(See: https://wiki.debian.org/DebianRepository/Format#Flat_Repository_Format).<br>" +
+             "When syncing a repo using flat repository format specify exactly one distribution, which must end with a \"/\". When<br>" +
+             "syncing repositories that do not use \"flat repository format\" you must not use a trailing \"/\" for your distributions! <br>");
 
             $scope.componentPopover = $sce.trustAsHtml("Requesting a component that does not exist in the upstream repo, will result in <br/>" +
              "a Pulp warning, but no error. A typo can therefore result in missing content.");

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -224,7 +224,8 @@
         <input id="upstream_password"
                name="upstream_password"
                ng-model="repository.upstream_password"
-               type="password"/>
+               type="password"
+               autocomplete="new-password"/>
         <p class="help-block" translate>
           Password of the upstream repository user for authentication. Leave empty if repository does not require authentication.
         </p>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js

@@ -37,7 +37,7 @@ angular.module('Bastion.products').controller('DiscoveryCreateController',
                 'content_type': repo.contentType,
                 'product_id': $scope.createRepoChoices.existingProductId,
                 unprotected: $scope.createRepoChoices.unprotected,
-                'verify_ssl': $scope.createRepoChoices.verifySsl,
+                'verify_ssl_on_sync': $scope.createRepoChoices.verifySsl,
                 'upstream_username': $scope.createRepoChoices.upstreamUsername,
                 'upstream_password': $scope.createRepoChoices.upstreamPassword
             };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html

@@ -53,7 +53,7 @@
     <div class="checkbox" ng-show="discovery.contentType === 'yum'">
       <label>
         <input type="checkbox" id="unprotected" ng-model="createRepoChoices.unprotected" ng-disabled="creating()"/>
-        <span translate>Serve via HTTP</span>
+        <span translate>Unprotected</span>
       </label>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.routes.js

@@ -43,6 +43,7 @@ angular.module('Bastion.products').config(['$stateProvider', function ($statePro
 
     $stateProvider.state("product-discovery", {
         url: '/products/discovery',
+        controller: 'DiscoveryController',
         templateUrl: 'products/discovery/views/discovery-base.html',
         permission: 'edit_products',
         redirectTo: 'product-discovery.scan'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -1,5 +1,10 @@
-<div id="content-access-mode-banner" bst-alert="info" ng-show="simpleContentAccessEnabled">
+<div id="content-access-mode-banner" bst-alert="info" ng-if="simpleContentAccessEnabled">
   <span translate>
 This organization has Simple Content Access enabled.  Hosts are not required to have subscriptions attached to access repositories.
   </span>
 </div>
+<div id="non-sca-banner" bst-alert="warning" ng-if="isManifestImported && !simpleContentAccessEnabled">
+  <span translate>
+This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Legacy subscription management is deprecated and will be removed in a future version.
+  </span>
+</div>

data/lib/katello/engine.rb

@@ -68,11 +68,6 @@ module Katello
       }
 
       SETTINGS[:katello] = default_settings.deep_merge(SETTINGS[:katello] || {})
-
-      if (Setting.table_exists? rescue(false))
-        require_dependency File.expand_path('../../../app/models/setting/content.rb', __FILE__)
-        Setting::Content.load_defaults
-      end
     end
 
     initializer "katello.apipie" do
@@ -235,6 +230,7 @@ module Katello
 
       Katello::EventQueue.register_event(Katello::Events::ImportPool::EVENT_TYPE, Katello::Events::ImportPool)
       Katello::EventQueue.register_event(Katello::Events::AutoPublishCompositeView::EVENT_TYPE, Katello::Events::AutoPublishCompositeView)
+      Katello::EventQueue.register_event(Katello::Events::DeleteLatestContentViewVersion::EVENT_TYPE, Katello::Events::DeleteLatestContentViewVersion)
       Katello::EventQueue.register_event(Katello::Events::GenerateHostApplicability::EVENT_TYPE, Katello::Events::GenerateHostApplicability)
       Katello::EventQueue.register_event(Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, Katello::Events::DeleteHostAgentQueue)
       Katello::EventQueue.register_event(Katello::Events::DeletePool::EVENT_TYPE, Katello::Events::DeletePool)

data/lib/katello/permission_creator.rb

@@ -15,6 +15,7 @@ module Katello
       product_permissions
       subscription_permissions
       sync_plan_permissions
+      alternate_content_source_permissions
       user_permissions
     end
 
@@ -388,6 +389,33 @@ module Katello
                          :finder_scope => :syncable
     end
 
+    def alternate_content_source_permissions
+      @plugin.permission :view_alternate_content_sources,
+                         {
+                           'katello/api/v2/alternate_content_sources' => [:index, :show, :auto_complete_search]
+                         },
+                         :resource_type => 'Katello::AlternateContentSource',
+                         :finder_scope => :readable
+      @plugin.permission :create_alternate_content_sources,
+                         {
+                           'katello/api/v2/alternate_content_sources' => [:create]
+                         },
+                         :resource_type => 'Katello::AlternateContentSource',
+                         :finder_scope => :editable
+      @plugin.permission :edit_alternate_content_sources,
+                         {
+                           'katello/api/v2/alternate_content_sources' => [:update]
+                         },
+                         :resource_type => 'Katello::AlternateContentSource',
+                         :finder_scope => :editable
+      @plugin.permission :destroy_alternate_content_sources,
+                         {
+                           'katello/api/v2/alternate_content_sources' => [:destroy]
+                         },
+                         :resource_type => 'Katello::AlternateContentSource',
+                         :finder_scope => :deletable
+    end
+
     def user_permissions
       @plugin.permission :my_organizations,
                          {
@@ -399,15 +427,15 @@ module Katello
     def organization_permissions
       @plugin.permission :import_content,
                          {
-                           'katello/api/v2/content_imports' => [:library, :version, :index]
+                           'katello/api/v2/content_imports' => [:library, :version, :index, :repository]
                          },
                          :resource_type => 'Organization'
 
       @plugin.permission :export_content,
                          {
-                           'katello/api/v2/content_view_versions' => [:export],
-                           'katello/api/v2/content_exports' => [:library, :version, :index],
-                           'katello/api/v2/content_export_incrementals' => [:library, :version]
+                           'katello/api/v2/content_view_versions' => [:export, :repository],
+                           'katello/api/v2/content_exports' => [:library, :version, :index, :repository],
+                           'katello/api/v2/content_export_incrementals' => [:library, :version, :repository]
                          },
                          :resource_type => 'Organization'
     end