Merge pull request #1290 from spadgett/fix-add-to-project

Merged by openshift-bot

Author: OpenShift Bot

app/views/create/fromimage.html

@@ -15,7 +15,7 @@
                 <div ng-hide="imageStream">
                   Loading...
                 </div>
-                <div class="osc-form" ng-if="imageStream">
+                <div class="osc-form" ng-show="imageStream">
                   <alerts alerts="alerts"></alerts>
                   <div class="row">
                     <div class="col-md-2 icon hidden-sm hidden-xs">
@@ -148,7 +148,8 @@
 
                           <!-- Use ng-show instead of ng-if so the form is still marked invalid if a hidden field has errors. -->
                           <div ng-show="advancedOptions">
-                            <div class="form-group">
+                            <!-- Wait for project to load since the directive uses `canI` checks that need it. -->
+                            <div class="form-group" ng-if="project">
                               <osc-secrets model="buildConfig.secrets.gitSecret"
                                           namespace="projectName"
                                           display-type="source"

dist/scripts/templates.js

@@ -5028,7 +5028,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div ng-hide=\"imageStream\">\n" +
     "Loading...\n" +
     "</div>\n" +
-    "<div class=\"osc-form\" ng-if=\"imageStream\">\n" +
+    "<div class=\"osc-form\" ng-show=\"imageStream\">\n" +
     "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-2 icon hidden-sm hidden-xs\">\n" +
@@ -5110,7 +5110,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "\n" +
     "<div ng-show=\"advancedOptions\">\n" +
-    "<div class=\"form-group\">\n" +
+    "\n" +
+    "<div class=\"form-group\" ng-if=\"project\">\n" +
     "<osc-secrets model=\"buildConfig.secrets.gitSecret\" namespace=\"projectName\" display-type=\"source\" type=\"source\" service-account-to-link=\"builder\" secrets-by-type=\"secretsByType\" alerts=\"alerts\" allow-multiple-secrets=\"false\">\n" +
     "</osc-secrets>\n" +
     "</div>\n" +