Fixes #20999 - Reset env/cv for Activation Keys

This commit allows one unset the environment and content view for activation keys via the UI.
Katello · May 9, 2018 · 676c759 · 676c759
1 parent 275cecd
commit 676c759
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/...scripts/bastion_katello/activation-keys/details/activation-key-details-info.controller.js b/...scripts/bastion_katello/activation-keys/details/activation-key-details-info.controller.js
@@ -30,10 +30,17 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsInfoCo
         });
 
         $scope.$watch('activationKey.environment', function (environment) {
-            if (environment && $scope.originalEnvironment) {
-                if (environment.id !== $scope.originalEnvironment.id) {
-                    $scope.editContentView = true;
+            if ($scope.originalEnvironment) {
+                if (environment) {
+                    if (environment.id !== $scope.originalEnvironment.id) {
+                        $scope.editContentView = true;
+                        $scope.disableEnvironmentSelection = true;
+                    }
+                } else {
                     $scope.disableEnvironmentSelection = true;
+                    $scope.editContentView = false;
+                    $scope.activationKey["environment_id"] = null;
+                    $scope.resetContentView($scope.activationKey);
                 }
             } else if (environment) {
                 $scope.editEnvironment = true;
@@ -57,10 +64,34 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsInfoCo
             $scope.editEnvironment = false;
             $scope.save(activationKey).then(function (actKey) {
                 $scope.originalEnvironment = actKey.environment;
+                $scope.resetEnvironmentPathSelector(activationKey);
             });
             $scope.disableEnvironmentSelection = false;
         };
 
+        $scope.resetEnvironmentPathSelector = function (activationKey) {
+            // reset "selected" in the environment widget.
+            _.each($scope.environments, function (environmentPath) {
+                _.each(environmentPath, function (individualEnv) {
+                    if (activationKey["environment_id"] !== individualEnv.id) {
+                        delete individualEnv.selected;
+                    } else {
+                        individualEnv.selected = true;
+                    }
+                });
+            });
+        };
+
+        $scope.resetEnvironment = function (activationKey) {
+            delete activationKey.environment;
+        };
+
+        $scope.resetContentView = function (activationKey) {
+            activationKey["content_view_id"] = null;
+            activationKey["content_view"] = null;
+            $scope.saveContentView(activationKey);
+        };
+
         $scope.releaseVersions = function () {
             var deferred = $q.defer();
 

diff --git a/...assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html b/...assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html
@@ -100,11 +100,13 @@ <h4 translate>Activation Key Content</h4>
       </dt>
       <dd bst-feature-flag="lifecycle_environments">
         <div bst-edit-select="activationKey.content_view.name"
-             readonly="denied('edit_activation_keys', activationKey)"
+             readonly="denied('edit_activation_keys', activationKey) || activationKey.environment === undefined || activationKey.environment === null"
              selector="activationKey.content_view.id"
              options="contentViews()"
              on-cancel="cancelContentViewUpdate()"
              on-save="saveContentView(activationKey)"
+             deletable="activationKey.content_view"
+             on-delete="resetEnvironment(activationKey)"
              edit-trigger="editContentView">
         </div>