Merge pull request #1026 from jwforres/rollback-template

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/controllers/replicaSet.js

@@ -12,6 +12,7 @@ angular.module('openshiftConsole')
                         $filter,
                         $routeParams,
                         AlertMessageService,
+                        AuthorizationService,
                         BreadcrumbsService,
                         DataService,
                         DeploymentsService,
@@ -78,8 +79,10 @@ angular.module('openshiftConsole')
       $scope.metricsAvailable = available;
     });
 
+    var deploymentStatus = $filter('deploymentStatus');
+
     var setLogVars = function(replicaSet) {
-      $scope.logCanRun = !(_.includes(['New', 'Pending'], $filter('deploymentStatus')(replicaSet)));
+      $scope.logCanRun = !(_.includes(['New', 'Pending'], deploymentStatus(replicaSet)));
     };
 
     var altTextForValueFrom = $filter('altTextForValueFrom');
@@ -436,16 +439,13 @@ angular.module('openshiftConsole')
           if (!action) {
             // Loading of the page that will create deploymentConfigDeploymentsInProgress structure, which will associate running deployment to his deploymentConfig.
             $scope.deploymentConfigDeploymentsInProgress = DeploymentsService.associateRunningDeploymentToDeploymentConfig($scope.deploymentsByDeploymentConfig);
-          } else if (action === 'ADDED' || (action === 'MODIFIED' && ['New', 'Pending', 'Running'].indexOf($filter('deploymentStatus')(replicaSet)) > -1)) {
+          } else if (action === 'ADDED' || (action === 'MODIFIED' && $filter('deploymentIsInProgress')(replicaSet))) {
             // When new deployment id instantiated/cloned, or in case of a retry, associate him to his deploymentConfig and add him into deploymentConfigDeploymentsInProgress structure.
             $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName] = $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName] || {};
             $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName][rsName] = replicaSet;
           } else if (action === 'MODIFIED') {
             // After the deployment ends remove him from the deploymentConfigDeploymentsInProgress structure.
-            var status = $filter('deploymentStatus')(replicaSet);
-            if (status === "Complete" || status === "Failed"){
-              delete $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName][rsName];
-            }
+            delete $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName][rsName];
           }
 
           // Extract the causes from the encoded deployment config
@@ -490,6 +490,15 @@ angular.module('openshiftConsole')
           updateHPAWarnings();
         });
 
+        var deploymentIsLatest = $filter('deploymentIsLatest');
+
+        $scope.showRollbackAction = function() {
+          return deploymentStatus($scope.replicaSet) === 'Complete' &&
+            !deploymentIsLatest($scope.replicaSet, $scope.deploymentConfig) &&
+            !$scope.replicaSet.metadata.deletionTimestamp &&
+            AuthorizationService.canI('deploymentconfigrollbacks', 'create');
+        };
+
         $scope.retryFailedDeployment = function(replicaSet) {
           DeploymentsService.retryFailedDeployment(replicaSet, context, $scope);
         };

Diff for: app/views/browse/_replica-set-details.html

@@ -17,7 +17,7 @@
         <status-icon status="replicaSet | deploymentStatus"></status-icon>
         {{replicaSet | deploymentStatus}}
         <span style="margin-left: 7px;">
-          <button ng-show="!rollBackCollapsed && (replicaSet | deploymentStatus) == 'Complete' && !(replicaSet | deploymentIsLatest : deploymentConfig) && !replicaSet.metadata.deletionTimestamp && ('deploymentconfigrollbacks' | canI : 'create')" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" type="button" class="btn btn-default btn-xs" ng-click="rollBackCollapsed = !rollBackCollapsed">Roll Back</button>
+          <button ng-show="!rollBackCollapsed && showRollbackAction()" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" type="button" class="btn btn-default btn-xs" ng-click="rollBackCollapsed = !rollBackCollapsed">Roll Back</button>
           <div ng-show="rollBackCollapsed" class="well well-sm">
             Use the following settings from {{replicaSet.metadata.name}} when rolling back:
             <div class="checkbox">