Merge pull request #2264 from rhamilto/issue-484

Automatic merge from submit-queue. Adding default message if no description is provided Fixes openshift/origin-web-catalog#484
openshift · Oct 13, 2017 · 9930f0c · 9930f0c
2 parents dc42390 + d5d975c
commit 9930f0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/directives/from-file-dialog.html b/app/views/directives/from-file-dialog.html
@@ -66,7 +66,7 @@
           </div>
         </div>
         <div class="order-service-description-block">
-          <p ng-bind-html="$ctrl.template | description | linky : '_blank'" class="description"></p>
+          <p ng-bind-html="($ctrl.template | description | linky : '_blank') || 'No description provided.'" class="description"></p>
         </div>
       </div>
       <div class="order-service-config">

diff --git a/app/views/directives/process-template-dialog/process-template-info.html b/app/views/directives/process-template-dialog/process-template-info.html
@@ -27,6 +27,6 @@
     </div>
   </div>
   <div class="order-service-description-block">
-    <p ng-bind-html="$ctrl.template | description | linky : '_blank'" class="description"></p>
+    <p ng-bind-html="($ctrl.template | description | linky : '_blank') || 'No description provided.'" class="description"></p>
   </div>
 </div>
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -7057,7 +7057,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "<div class=\"order-service-description-block\">\n" +
-    "<p ng-bind-html=\"$ctrl.template | description | linky : '_blank'\" class=\"description\"></p>\n" +
+    "<p ng-bind-html=\"($ctrl.template | description | linky : '_blank') || 'No description provided.'\" class=\"description\"></p>\n" +
     "</div>\n" +
     "</div>\n" +
     "<div class=\"order-service-config\">\n" +
@@ -8897,7 +8897,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "<div class=\"order-service-description-block\">\n" +
-    "<p ng-bind-html=\"$ctrl.template | description | linky : '_blank'\" class=\"description\"></p>\n" +
+    "<p ng-bind-html=\"($ctrl.template | description | linky : '_blank') || 'No description provided.'\" class=\"description\"></p>\n" +
     "</div>\n" +
     "</div>"
   );