Bug 1404079 - Show build reason consistently when the build is in any phase except Cancelled

Author: jwforres

Diff for: app/views/browse/build-config.html

@@ -202,8 +202,8 @@ <h2>No builds.</h2>
                             <td data-title="Status">
                               <div row class="status">
                                 <status-icon status="build.status.phase" disable-animation fixed-width="true"></status-icon>
-                                <span ng-if="build.status.phase ==='Failed'">{{(build.status.reason || build.status.phase) | sentenceCase}}</span>
-                                <span ng-if="build.status.phase !== 'Failed'">{{build.status.phase | sentenceCase}}</span>
+                                <span ng-if="!build.status.reason || build.status.phase === 'Cancelled'">{{build.status.phase}}</span>
+                                <span ng-if="build.status.reason && build.status.phase !== 'Cancelled'">{{build.status.reason | sentenceCase}}</span>
                               </div>
                             </td>
                             <td data-title="Duration">

Diff for: app/views/builds.html

@@ -84,8 +84,8 @@ <h1>
                       <div row class="status">
                         <!-- <build-status build="build"></build-status> -->
                         <status-icon status="latestBuild.status.phase" disable-animation fixed-width="true"></status-icon>
-                        <span ng-if="latestBuild.status.phase ==='Failed'">{{(latestBuild.status.reason || latestBuild.status.phase) | sentenceCase}}</span>
-                        <span ng-if="latestBuild.status.phase !== 'Failed'">{{latestBuild.status.phase | sentenceCase}}</span>
+                        <span ng-if="!latestBuild.status.reason || latestBuild.status.phase === 'Cancelled'">{{latestBuild.status.phase}}</span>
+                        <span ng-if="latestBuild.status.reason && latestBuild.status.phase !== 'Cancelled'">{{latestBuild.status.reason | sentenceCase}}</span>
                       </div>
                     </td>
                     <td data-title="Duration">

Diff for: dist/scripts/templates.js

@@ -1908,8 +1908,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<td data-title=\"Status\">\n" +
     "<div row class=\"status\">\n" +
     "<status-icon status=\"build.status.phase\" disable-animation fixed-width=\"true\"></status-icon>\n" +
-    "<span ng-if=\"build.status.phase ==='Failed'\">{{(build.status.reason || build.status.phase) | sentenceCase}}</span>\n" +
-    "<span ng-if=\"build.status.phase !== 'Failed'\">{{build.status.phase | sentenceCase}}</span>\n" +
+    "<span ng-if=\"!build.status.reason || build.status.phase === 'Cancelled'\">{{build.status.phase}}</span>\n" +
+    "<span ng-if=\"build.status.reason && build.status.phase !== 'Cancelled'\">{{build.status.reason | sentenceCase}}</span>\n" +
     "</div>\n" +
     "</td>\n" +
     "<td data-title=\"Duration\">\n" +
@@ -4043,8 +4043,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div row class=\"status\">\n" +
     "\n" +
     "<status-icon status=\"latestBuild.status.phase\" disable-animation fixed-width=\"true\"></status-icon>\n" +
-    "<span ng-if=\"latestBuild.status.phase ==='Failed'\">{{(latestBuild.status.reason || latestBuild.status.phase) | sentenceCase}}</span>\n" +
-    "<span ng-if=\"latestBuild.status.phase !== 'Failed'\">{{latestBuild.status.phase | sentenceCase}}</span>\n" +
+    "<span ng-if=\"!latestBuild.status.reason || latestBuild.status.phase === 'Cancelled'\">{{latestBuild.status.phase}}</span>\n" +
+    "<span ng-if=\"latestBuild.status.reason && latestBuild.status.phase !== 'Cancelled'\">{{latestBuild.status.reason | sentenceCase}}</span>\n" +
     "</div>\n" +
     "</td>\n" +
     "<td data-title=\"Duration\">\n" +