Skip to content

Commit

Permalink
Merge pull request #1073 from spadgett/show-prefilled-source-context
Browse files Browse the repository at this point in the history 
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Jan 3, 2017
2 parents 3453605 + b813cb8 commit 0b1435e
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 24 deletions.
5 changes: 5 additions & 0 deletions app/scripts/controllers/create/createFromImage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ angular.module("openshiftConsole")
scope.buildConfig.sourceUrl = annotations.sampleRepo || "";
scope.buildConfig.gitRef = annotations.sampleRef || "";
scope.buildConfig.contextDir = annotations.sampleContextDir || "";
if (annotations.sampleRef || annotations.sampleContextDir) {
// Show the advanced source options (without exapnding all
// advanced options) if the sample repo uses it.
scope.advancedSourceOptions = true;
}
};

scope.usingSampleRepo = function() {
Expand Down
37 changes: 19 additions & 18 deletions app/views/create/fromimage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@
</div>
<div class="row">
<div ng-class="{
'col-md-8': advancedOptions,
'col-lg-12': !advancedOptions}">
'col-md-8': advancedOptions || advancedSourceOptions,
'col-lg-12': !advancedOptions && !advancedSourceOptions
}">
<div class="form-group">
<label for="sourceUrl" class="required">Git Repository URL</label>
<div ng-class="{
Expand Down Expand Up @@ -107,7 +108,7 @@
</div>
</div>

<div class="col-md-4" ng-if="advancedOptions">
<div class="col-md-4" ng-if="advancedOptions || advancedSourceOptions">
<div class="form-group">
<label for="gitref">Git Reference</label>
<div>
Expand All @@ -126,23 +127,23 @@
</div>
</div>

<div ng-if="advancedOptions">
<div class="form-group">
<label for="contextdir">Context Dir</label>
<div>
<input
id="contextdir"
ng-model="buildConfig.contextDir"
type="text"
placeholder="/"
autocorrect="off"
autocapitalize="off"
spellcheck="false"
class="form-control">
</div>
<div class="help-block">Optional subdirectory for the application source code, used as the context directory for the build.</div>
<div ng-if="advancedOptions || advancedSourceOptions" class="form-group">
<label for="contextdir">Context Dir</label>
<div>
<input
id="contextdir"
ng-model="buildConfig.contextDir"
type="text"
placeholder="/"
autocorrect="off"
autocapitalize="off"
spellcheck="false"
class="form-control">
</div>
<div class="help-block">Optional subdirectory for the application source code, used as the context directory for the build.</div>
</div>

<div ng-if="advancedOptions">
<div class="form-group">
<osc-secrets model="buildConfig.secrets.gitSecret"
namespace="projectName"
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7806,7 +7806,7 @@ value:!0
resources:{}
}, b.cpuRequestCalculated = j.isRequestCalculated("cpu", e), b.cpuLimitCalculated = j.isLimitCalculated("cpu", e), b.memoryRequestCalculated = j.isRequestCalculated("memory", e), b.fillSampleRepo = function() {
var a;
(b.image || b.image.metadata || b.image.metadata.annotations) && (a = b.image.metadata.annotations, b.buildConfig.sourceUrl = a.sampleRepo || "", b.buildConfig.gitRef = a.sampleRef || "", b.buildConfig.contextDir = a.sampleContextDir || "");
(b.image || b.image.metadata || b.image.metadata.annotations) && (a = b.image.metadata.annotations, b.buildConfig.sourceUrl = a.sampleRepo || "", b.buildConfig.gitRef = a.sampleRef || "", b.buildConfig.contextDir = a.sampleContextDir || "", (a.sampleRef || a.sampleContextDir) && (b.advancedSourceOptions = !0));
}, b.usingSampleRepo = function() {
return b.buildConfig.sourceUrl === _.get(b, "image.metadata.annotations.sampleRepo");
}, k.isAvailable().then(function(b) {
Expand Down
11 changes: 6 additions & 5 deletions dist/scripts/templates.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4799,8 +4799,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<div class=\"row\">\n" +
"<div ng-class=\"{\n" +
" 'col-md-8': advancedOptions,\n" +
" 'col-lg-12': !advancedOptions}\">\n" +
" 'col-md-8': advancedOptions || advancedSourceOptions,\n" +
" 'col-lg-12': !advancedOptions && !advancedSourceOptions\n" +
" }\">\n" +
"<div class=\"form-group\">\n" +
"<label for=\"sourceUrl\" class=\"required\">Git Repository URL</label>\n" +
"<div ng-class=\"{\n" +
Expand All @@ -4822,7 +4823,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"col-md-4\" ng-if=\"advancedOptions\">\n" +
"<div class=\"col-md-4\" ng-if=\"advancedOptions || advancedSourceOptions\">\n" +
"<div class=\"form-group\">\n" +
"<label for=\"gitref\">Git Reference</label>\n" +
"<div>\n" +
Expand All @@ -4832,14 +4833,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</div>\n" +
"</div>\n" +
"<div ng-if=\"advancedOptions\">\n" +
"<div class=\"form-group\">\n" +
"<div ng-if=\"advancedOptions || advancedSourceOptions\" class=\"form-group\">\n" +
"<label for=\"contextdir\">Context Dir</label>\n" +
"<div>\n" +
"<input id=\"contextdir\" ng-model=\"buildConfig.contextDir\" type=\"text\" placeholder=\"/\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\" class=\"form-control\">\n" +
"</div>\n" +
"<div class=\"help-block\">Optional subdirectory for the application source code, used as the context directory for the build.</div>\n" +
"</div>\n" +
"<div ng-if=\"advancedOptions\">\n" +
"<div class=\"form-group\">\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" +
Expand Down

0 comments on commit 0b1435e

Please sign in to comment.