Merge pull request #2342 from spadgett/fix-import-yaml-runtime-error

Automatic merge from submit-queue. Fix runtime error opening Import YAML dialog Fixes #2337
openshift · Oct 23, 2017 · 417b53a · 417b53a
2 parents 6ce98f4 + 9c1ea80
commit 417b53a
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
@@ -74,7 +74,7 @@
           <div class="osc-form">
             <alerts alerts="$ctrl.alerts"></alerts>
             <form name="$ctrl.templateForm">
-              <process-template project="$ctrl.selectedProject" template="$ctrl.template" alerts="$ctrl.alerts" is-dialog="true"></process-template>
+              <process-template ng-if="$ctrl.template" project="$ctrl.selectedProject" template="$ctrl.template" alerts="$ctrl.alerts" is-dialog="true"></process-template>
             </form>
           </div>
         </div>

diff --git a/app/views/directives/process-template-dialog/process-template-config.html b/app/views/directives/process-template-dialog/process-template-config.html
@@ -1,7 +1,7 @@
 <div class="order-service-config">
   <div class="osc-form">
     <form name="$ctrl.form">
-      <process-template template="$ctrl.template" project="$ctrl.preSelectedProject" on-project-selected="$ctrl.onProjectSelected" available-projects="$ctrl.unfilteredProjects" is-dialog="true"></process-template>
+      <process-template ng-if="$ctrl.template" template="$ctrl.template" project="$ctrl.preSelectedProject" on-project-selected="$ctrl.onProjectSelected" available-projects="$ctrl.unfilteredProjects" is-dialog="true"></process-template>
     </form>
   </div>
 </div>
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -7182,7 +7182,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"osc-form\">\n" +
     "<alerts alerts=\"$ctrl.alerts\"></alerts>\n" +
     "<form name=\"$ctrl.templateForm\">\n" +
-    "<process-template project=\"$ctrl.selectedProject\" template=\"$ctrl.template\" alerts=\"$ctrl.alerts\" is-dialog=\"true\"></process-template>\n" +
+    "<process-template ng-if=\"$ctrl.template\" project=\"$ctrl.selectedProject\" template=\"$ctrl.template\" alerts=\"$ctrl.alerts\" is-dialog=\"true\"></process-template>\n" +
     "</form>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -8981,7 +8981,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"order-service-config\">\n" +
     "<div class=\"osc-form\">\n" +
     "<form name=\"$ctrl.form\">\n" +
-    "<process-template template=\"$ctrl.template\" project=\"$ctrl.preSelectedProject\" on-project-selected=\"$ctrl.onProjectSelected\" available-projects=\"$ctrl.unfilteredProjects\" is-dialog=\"true\"></process-template>\n" +
+    "<process-template ng-if=\"$ctrl.template\" template=\"$ctrl.template\" project=\"$ctrl.preSelectedProject\" on-project-selected=\"$ctrl.onProjectSelected\" available-projects=\"$ctrl.unfilteredProjects\" is-dialog=\"true\"></process-template>\n" +
     "</form>\n" +
     "</div>\n" +
     "</div>"