github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(ui): certificate fields fixed EE-3692 (#7336)

pull/7374/head
Prabhat Khera 2022-07-28 14:41:26 +12:00 committed by GitHub
parent e779939ae1
commit bb066cd58c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/kubernetes/views/applications/create/createApplication.html
View File

@ -389,15 +389,17 @@
<!-- has-override --> <!-- has-override -->
<div class="col-sm-12 form-inline" style="margin-top: 10px" ng-if="config.Overriden"> <div class="col-sm-12 form-inline" style="margin-top: 10px" ng-if="config.Overriden">
<div ng-repeat="(keyIndex, overridenKey) in config.OverridenKeys" style="margin-top: 2px"> <div ng-repeat="(keyIndex, overridenKey) in config.OverridenKeys" style="margin-top: 2px">
<div style="margin-top: 2px"> <div class="row">
<div class="col-sm-1 input-group input-group-sm" style="margin-left: 3px"></div> <div class="col-sm-3 col-lg-2 form-group !m-0"><span>&nbsp;</span></div>
<div class="col-sm-3 input-group input-group-sm"> <div class="col-sm-3 form-group" style="margin-left: -11px">
<div class="input-group input-group-sm">
<span class="input-group-addon">configuration key</span> <span class="input-group-addon">configuration key</span>
<input type="text" class="form-control" ng-value="overridenKey.Key" disabled /> <input type="text" class="form-control" ng-value="overridenKey.Key" disabled />
</div> </div>
</div>
<div class="col-sm-3 input-group input-group-sm" ng-if="overridenKey.Type === ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM"> <div class="col-sm-3 form-group" ng-if="overridenKey.Type === ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM">
<div class="col-sm-12 input-group input-group-sm"> <div class="input-group input-group-sm">
<span class="input-group-addon">path on disk</span> <span class="input-group-addon">path on disk</span>
<input <input
type="text" type="text"
@ -411,29 +413,15 @@
data-cy="k8sAppCreate-pathOnDiskInput" data-cy="k8sAppCreate-pathOnDiskInput"
/> />
</div> </div>
</div> <span
<div class="input-group col-sm-4 btn-group btn-group-sm">
<label class="btn btn-primary" ng-model="overridenKey.Type" uib-btn-radio="ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.ENVIRONMENT">
<pr-icon icon="'list'" feather="true"></pr-icon> Environment
</label>
<label class="btn btn-primary" ng-model="overridenKey.Type" uib-btn-radio="ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM">
<pr-icon icon="'file-text'" feather="true"></pr-icon> Filesystem
</label>
</div>
</div>
<div
ng-show=" ng-show="
kubernetesApplicationCreationForm['overriden_key_path_' + index + '_' + keyIndex].$invalid || kubernetesApplicationCreationForm['overriden_key_path_' + index + '_' + keyIndex].$invalid ||
ctrl.state.duplicates.configurationPaths.refs[index + '_' + keyIndex] !== undefined ctrl.state.duplicates.configurationPaths.refs[index + '_' + keyIndex] !== undefined
" "
> >
<div class="col-sm-1 input-group input-group-sm" style="margin-left: 3px"></div> <div class="input-group input-group-sm text-muted" ng-if="overridenKey.Type === ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM">
<div class="col-sm-3 input-group input-group-sm"></div>
<div class="col-sm-3 input-group input-group-sm" ng-if="overridenKey.Type === ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM">
<div <div
class="small text-warning" class="small"
style="margin-top: 5px" style="margin-top: 5px"
ng-show=" ng-show="
kubernetesApplicationCreationForm['overriden_key_path_' + index + '_' + keyIndex].$invalid || kubernetesApplicationCreationForm['overriden_key_path_' + index + '_' + keyIndex].$invalid ||
@ -448,7 +436,19 @@
> >
</div> </div>
</div> </div>
<div class="col-sm-4 input-group input-group-sm"></div> </span>
</div>
<div class="col-sm-4 form-group">
<div class="input-group btn-group btn-group-sm">
<label class="btn btn-light" ng-model="overridenKey.Type" uib-btn-radio="ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.ENVIRONMENT">
<pr-icon icon="'list'" feather="true"></pr-icon> Environment
</label>
<label class="btn btn-light" ng-model="overridenKey.Type" uib-btn-radio="ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM">
<pr-icon icon="'file-text'" feather="true"></pr-icon> Filesystem
</label>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>