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

fix(git): EE-3727 nomad extension not available (#7595)

pull/7559/head
congs 2022-09-06 10:54:21 +12:00 committed by GitHub
parent 602e42739e
commit f870619fb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-file-item/git-form-additional-file-item.html
View File

@ -3,15 +3,7 @@
<div class="form-inline mt-3">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon required">path</span>
<input
type="text"
name="name"
class="form-control"
ng-model="$ctrl.variable"
ng-change="$ctrl.onChangePath($ctrl.variable)"
ng-pattern="/.+\.(yml|yaml|json|hcl)$/i"
required
/>
<input type="text" name="name" class="form-control" ng-model="$ctrl.variable" ng-change="$ctrl.onChangePath($ctrl.variable)" required />
</div>
<button class="btn btn-dangerlight" type="button" ng-click="$ctrl.removeValue()" title="Remove">
<pr-icon icon="'trash-2'" feather="true" size="'md'"></pr-icon>
@ -21,9 +13,6 @@
<div class="small text-muted">
<div ng-messages="$ctrl[$ctrl.formName].name.$error" class="mt-1">
<p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Path is required. </p>
<p class="vertical-center" ng-message="pattern">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> File path must include yaml, yml, json, or hcl extension
</p>
</div>
</div>
</div>

6
app/portainer/components/forms/git-form/git-form-compose-path-field/git-form-compose-path-field.html
View File

@ -2,7 +2,7 @@
<div class="form-group">
<span class="col-sm-12 text-muted small vertical-center">
<pr-icon icon="'info'" mode="'primary'" feather="true"></pr-icon> Indicate the path to the {{ $ctrl.deployMethod == 'compose' ? 'Compose' : 'Manifest' }} file from the root
of your repository (requires a yaml, yml, json, or hcl file extension)
of your repository
</span>
</div>
<div class="form-group">
@ -16,12 +16,8 @@
ng-change="$ctrl.onChange($ctrl.value)"
id="stack_repository_path"
placeholder="{{ $ctrl.deployMethod == 'compose' ? 'docker-compose.yml' : 'manifest.yml' }}"
ng-pattern="/.+\.(yml|yaml|json|hcl)$/i"
required
/>
<p class="mt-2 text-muted small vertical-center" ng-show="pathForm.repoPathField.$error.pattern">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Invalid file path
</p>
</div>
</div>
</ng-form>