Skip to content

Commit b2a602f

Browse files
Merge pull request #2305 from spadgett/fix-add-to-app
Automatic merge from submit-queue. Mount path is not required for envFrom In the add to application dialog, don't require a mount path when adding environment variables. Fixes #2303 cc @cfchase
2 parents a7bc1f0 + 0632c31 commit b2a602f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: app/views/directives/add-config-to-application.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ <h3>Add to Application</h3>
5353
id="mountVolume"
5454
placeholder="Enter a mount path"
5555
type="text"
56-
required
5756
ng-pattern="/^\/.*$/"
5857
osc-unique="ctrl.existingMountPaths"
5958
aria-describedby="mount-path-help"
6059
ng-disabled="ctrl.addType !== 'volume' || ctrl.disableInputs || !ctrl.application"
60+
ng-required="ctrl.addType === 'volume'"
6161
ng-model="ctrl.mountVolume"
6262
autocorrect="off"
6363
autocapitalize="off"

Diff for: dist/scripts/templates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5765,7 +5765,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
57655765
"</div>\n" +
57665766
"<div class=\"volume-options\">\n" +
57675767
"<div ng-class=\"{'has-error': (addToApplicationForm.mountVolume.$error.oscUnique || (addToApplicationForm.mountVolume.$error.pattern && addToApplicationForm.mountVolume.$touched))}\">\n" +
5768-
"<input class=\"form-control\" name=\"mountVolume\" id=\"mountVolume\" placeholder=\"Enter a mount path\" type=\"text\" required ng-pattern=\"/^\\/.*$/\" osc-unique=\"ctrl.existingMountPaths\" aria-describedby=\"mount-path-help\" ng-disabled=\"ctrl.addType !== 'volume' || ctrl.disableInputs || !ctrl.application\" ng-model=\"ctrl.mountVolume\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\">\n" +
5768+
"<input class=\"form-control\" name=\"mountVolume\" id=\"mountVolume\" placeholder=\"Enter a mount path\" type=\"text\" ng-pattern=\"/^\\/.*$/\" osc-unique=\"ctrl.existingMountPaths\" aria-describedby=\"mount-path-help\" ng-disabled=\"ctrl.addType !== 'volume' || ctrl.disableInputs || !ctrl.application\" ng-required=\"ctrl.addType === 'volume'\" ng-model=\"ctrl.mountVolume\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\">\n" +
57695769
"</div>\n" +
57705770
"<div class=\"help-block bind-description\">\n" +
57715771
"Mount Path for the volume. A file will be created in this directory for each key from the {{ctrl.apiObject.kind | humanizeKind}}. The file contents will be the value of the key.\n" +

0 commit comments

Comments
 (0)