Merge pull request #2328 from spadgett/instance-pending-message

Automatic merge from submit-queue. Fix pending message for service instances on overview `row.pendingMessage` was never getting set.
openshift · Oct 20, 2017 · 8fe1c7e · 8fe1c7e
2 parents db5675a + a4b4cfe
commit 8fe1c7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/overview/_service-instance-row.html b/app/views/overview/_service-instance-row.html
@@ -128,7 +128,7 @@ <h3>
                 <span class="pficon pficon-info" aria-hidden="true"></span>
                 <span class="sr-only">info</span>
                 <span class="strong">The service is not yet ready.</span>
-                <truncate-long-text content="row.pendingMessage" limit="265"></truncate-long-text>
+                <truncate-long-text content="row.apiObject | serviceInstanceReadyMessage" limit="265"></truncate-long-text>
               </div>
             </div>
           </div>

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -12620,7 +12620,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "<span class=\"sr-only\">info</span>\n" +
     "<span class=\"strong\">The service is not yet ready.</span>\n" +
-    "<truncate-long-text content=\"row.pendingMessage\" limit=\"265\"></truncate-long-text>\n" +
+    "<truncate-long-text content=\"row.apiObject | serviceInstanceReadyMessage\" limit=\"265\"></truncate-long-text>\n" +
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +