Browse code

bump(github.com/openshift/origin-web-console): 0b1435e239c27e3c52ad745a76ea29b5f8ee1ffd

OpenShift Bot authored on 2017/01/04 00:44:36
Showing 1 changed files
... ...
@@ -9033,7 +9033,7 @@ value:!0
9033 9033
 resources:{}
9034 9034
 }, b.cpuRequestCalculated = j.isRequestCalculated("cpu", e), b.cpuLimitCalculated = j.isLimitCalculated("cpu", e), b.memoryRequestCalculated = j.isRequestCalculated("memory", e), b.fillSampleRepo = function() {
9035 9035
 var a;
9036
-(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 || "");
9036
+(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));
9037 9037
 }, b.usingSampleRepo = function() {
9038 9038
 return b.buildConfig.sourceUrl === _.get(b, "image.metadata.annotations.sampleRepo");
9039 9039
 }, k.isAvailable().then(function(b) {
... ...
@@ -20735,8 +20735,9 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
20735 20735
     "</div>\n" +
20736 20736
     "<div class=\"row\">\n" +
20737 20737
     "<div ng-class=\"{\n" +
20738
-    "                              'col-md-8': advancedOptions,\n" +
20739
-    "                              'col-lg-12': !advancedOptions}\">\n" +
20738
+    "                              'col-md-8': advancedOptions || advancedSourceOptions,\n" +
20739
+    "                              'col-lg-12': !advancedOptions && !advancedSourceOptions\n" +
20740
+    "                            }\">\n" +
20740 20741
     "<div class=\"form-group\">\n" +
20741 20742
     "<label for=\"sourceUrl\" class=\"required\">Git Repository URL</label>\n" +
20742 20743
     "<div ng-class=\"{\n" +
... ...
@@ -20758,7 +20759,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
20758 20758
     "</div>\n" +
20759 20759
     "</div>\n" +
20760 20760
     "</div>\n" +
20761
-    "<div class=\"col-md-4\" ng-if=\"advancedOptions\">\n" +
20761
+    "<div class=\"col-md-4\" ng-if=\"advancedOptions || advancedSourceOptions\">\n" +
20762 20762
     "<div class=\"form-group\">\n" +
20763 20763
     "<label for=\"gitref\">Git Reference</label>\n" +
20764 20764
     "<div>\n" +
... ...
@@ -20768,14 +20769,14 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
20768 20768
     "</div>\n" +
20769 20769
     "</div>\n" +
20770 20770
     "</div>\n" +
20771
-    "<div ng-if=\"advancedOptions\">\n" +
20772
-    "<div class=\"form-group\">\n" +
20771
+    "<div ng-if=\"advancedOptions || advancedSourceOptions\" class=\"form-group\">\n" +
20773 20772
     "<label for=\"contextdir\">Context Dir</label>\n" +
20774 20773
     "<div>\n" +
20775 20774
     "<input id=\"contextdir\" ng-model=\"buildConfig.contextDir\" type=\"text\" placeholder=\"/\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\" class=\"form-control\">\n" +
20776 20775
     "</div>\n" +
20777 20776
     "<div class=\"help-block\">Optional subdirectory for the application source code, used as the context directory for the build.</div>\n" +
20778 20777
     "</div>\n" +
20778
+    "<div ng-if=\"advancedOptions\">\n" +
20779 20779
     "<div class=\"form-group\">\n" +
20780 20780
     "<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" +
20781 20781
     "</osc-secrets>\n" +