Browse code

bump(github.com/openshift/origin-web-console): a20a6942d2fdbddb0f71070027c2116c80649313

OpenShift Bot authored on 2016/12/17 06:53:33
Showing 1 changed files
... ...
@@ -5653,6 +5653,12 @@ var b = 0;
5653 5653
 return a && a.forEach(function(a) {
5654 5654
 a.state && a.state.running && b++;
5655 5655
 }), b;
5656
+}, a.showDebugAction = function(c) {
5657
+if ("Completed" === _.get(a, "pod.status.phase")) return !1;
5658
+if (z(a.pod, "openshift.io/build.name")) return !1;
5659
+if (b("isDebugPod")(a.pod)) return !1;
5660
+var d = _.get(c, "state.waiting.reason");
5661
+return "ImagePullBackOff" !== d && "ErrImagePull" !== d && (!_.get(c, "state.running") || !c.ready);
5656 5662
 }, a.$on("$destroy", function() {
5657 5663
 g.unwatchAll(l), n(), $(window).off("resize.terminalsize");
5658 5664
 });
... ...
@@ -17370,7 +17376,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
17370 17370
     "<dd>{{containerStatus.ready}}</dd>\n" +
17371 17371
     "<dt>Restart Count:</dt>\n" +
17372 17372
     "<dd>{{containerStatus.restartCount}}</dd>\n" +
17373
-    "<div ng-if=\"pod.status.phase !== 'Completed' && !(pod | annotation : 'openshift.io/build.name') && (!containerStatus.state.running || !containerStatus.ready) && !(pod | isDebugPod) && ('pods' | canI : 'create')\" class=\"debug-pod-action\">\n" +
17373
+    "<div ng-if=\"showDebugAction(containerStatus) && ('pods' | canI : 'create')\" class=\"debug-pod-action\">\n" +
17374 17374
     "<a href=\"\" ng-click=\"debugTerminal(containerStatus.name)\" role=\"button\">Debug in Terminal</a>\n" +
17375 17375
     "</div>\n" +
17376 17376
     "</dl>\n" +