Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix problem with add to project from Git repository #1290

Merged
merged 1 commit into from
Feb 22, 2017
Merged

Fix problem with add to project from Git repository #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/views/create/fromimage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down Expand Up @@ -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" +
Expand Down