Merge pull request #1959 from benjaminapetersen/bpeterse/issue/1875-r…

…esume-rollouts-stalled-ui Merged by openshift-bot
openshift · Oct 6, 2017 · 2e0fbe8 · 2e0fbe8
2 parents ec0a953 + 620ab1e
commit 2e0fbe8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/scripts/services/resourceAlerts.js b/app/scripts/services/resourceAlerts.js
@@ -101,6 +101,7 @@ angular.module("openshiftConsole")
                     details: $filter('getErrorDetails')(e)
                   };
                 });
+              return true;
             }
           }]
         };

diff --git a/app/views/browse/deployment-config.html b/app/views/browse/deployment-config.html
@@ -90,7 +90,7 @@ <h1 class="contains-actions">
       <div ng-if="!loaded">Loading...</div>
       <div class="row" ng-if="loaded">
         <div class="col-md-12" ng-class="{ 'hide-tabs' : !deploymentConfig }">
-          <div ng-if="deploymentConfig.spec.paused" class="alert alert-info animate-if">
+          <div ng-if="deploymentConfig.spec.paused && !updatingPausedState" class="alert alert-info animate-if">
             <span class="pficon pficon-info" aria-hidden="true"></span>
             <strong>{{deploymentConfig.metadata.name}} is paused.</strong>
             This will stop any new rollouts or triggers from running until resumed.

diff --git a/app/views/browse/deployment.html b/app/views/browse/deployment.html
@@ -1,5 +1,4 @@
 <div class="middle">
-
   <div class="middle-header">
     <div class="container-fluid">
       <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
@@ -71,7 +70,7 @@ <h1 class="contains-actions">
       <div ng-if="!loaded">Loading...</div>
       <div class="row" ng-if="loaded">
         <div class="col-md-12" ng-class="{ 'hide-tabs' : !deployment }">
-          <div ng-if="deployment.spec.paused" class="alert alert-info animate-if">
+          <div ng-if="deployment.spec.paused && !updatingPausedState" class="alert alert-info animate-if">
             <span class="pficon pficon-info" aria-hidden="true"></span>
             <strong>{{deployment.metadata.name}} is paused.</strong>
             This pauses any in-progress rollouts and stops new

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -4189,15 +4189,15 @@ links: [ {
 href: "",
 label: "Resume Rollouts",
 onClick: function() {
-n.setPaused(t, !1, {
+return n.setPaused(t, !1, {
 namespace: t.metadata.namespace
 }).then(_.noop, function(n) {
 a[t.metadata.uid + "-pause-error"] = {
 type: "error",
 message: "An error occurred resuming the " + s(t.kind) + ".",
 details: e("getErrorDetails")(n)
 };
-});
+}), !0;
 }
 } ]
 }), a;

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -2329,7 +2329,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div ng-if=\"!loaded\">Loading...</div>\n" +
     "<div class=\"row\" ng-if=\"loaded\">\n" +
     "<div class=\"col-md-12\" ng-class=\"{ 'hide-tabs' : !deploymentConfig }\">\n" +
-    "<div ng-if=\"deploymentConfig.spec.paused\" class=\"alert alert-info animate-if\">\n" +
+    "<div ng-if=\"deploymentConfig.spec.paused && !updatingPausedState\" class=\"alert alert-info animate-if\">\n" +
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "<strong>{{deploymentConfig.metadata.name}} is paused.</strong>\n" +
     "This will stop any new rollouts or triggers from running until resumed.\n" +
@@ -2625,7 +2625,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div ng-if=\"!loaded\">Loading...</div>\n" +
     "<div class=\"row\" ng-if=\"loaded\">\n" +
     "<div class=\"col-md-12\" ng-class=\"{ 'hide-tabs' : !deployment }\">\n" +
-    "<div ng-if=\"deployment.spec.paused\" class=\"alert alert-info animate-if\">\n" +
+    "<div ng-if=\"deployment.spec.paused && !updatingPausedState\" class=\"alert alert-info animate-if\">\n" +
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "<strong>{{deployment.metadata.name}} is paused.</strong>\n" +
     "This pauses any in-progress rollouts and stops new rollouts from running until the deployment is resumed.\n" +