Merge pull request #2424 from jeff-phillips-18/parameters

Automatic merge from submit-queue. Fix for adding non-builder templates to a project Fixes #2420
openshift · Nov 1, 2017 · ff20f86 · ff20f86
2 parents c0e7f37 + f8a817c
commit ff20f86
Show file tree

Hide file tree

Showing 2 changed files with 142 additions and 140 deletions.
diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -85,11 +85,13 @@
     ctrl.$onInit = function() {
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
       ctrl.preSelectedProject = ctrl.selectedProject = ctrl.project;
-      if (ctrl.project) {
-        ctrl.templateProject = ctrl.project;
-        ctrl.templateProjectChange();
+      if (ctrl.useProjectTemplate) {
+        if (ctrl.project) {
+          ctrl.templateProject = ctrl.project;
+          ctrl.templateProjectChange();
+        }
+        listProjects();
       }
-      listProjects();
 
       ctrl.noProjectsCantCreate = false;
       $scope.$on('no-projects-cannot-create', function() {