Browse Source

Fix form reset.

pull/1041/head
Sebastian 3 years ago
parent
commit
33537c20d4
  1. 2
      frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.html
  2. 17
      frontend/src/app/features/schemas/pages/schema/fields/field.component.html
  3. 5
      frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
  4. 2
      frontend/src/app/features/schemas/pages/schema/fields/forms/field-form.component.html
  5. 2
      frontend/src/app/features/settings/pages/clients/client-add-form.component.html
  6. 2
      frontend/src/app/features/settings/pages/languages/language.component.html
  7. 2
      frontend/src/app/features/settings/pages/roles/role-add-form.component.html
  8. 2
      frontend/src/app/features/settings/pages/roles/role.component.html
  9. 2
      frontend/src/app/features/settings/pages/workflows/workflow.component.html
  10. 2
      frontend/src/app/shared/components/forms/geolocation-editor.component.html

2
frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.html

@ -77,7 +77,7 @@
</ng-container> </ng-container>
<ng-container footer> <ng-container footer>
<button type="reset" class="float-start btn btn-text-secondary" (click)="emitClose()"> <button type="button" class="float-start btn btn-text-secondary" (click)="emitClose()">
{{ 'common.cancel' | sqxTranslate }} {{ 'common.cancel' | sqxTranslate }}
</button> </button>

17
frontend/src/app/features/schemas/pages/schema/fields/field.component.html

@ -91,13 +91,14 @@
<div class="table-items-row-details" *ngIf="isEditing"> <div class="table-items-row-details" *ngIf="isEditing">
<form [formGroup]="editForm.form" (ngSubmit)="save()"> <form [formGroup]="editForm.form" (ngSubmit)="save()">
<sqx-field-form showButtons="true" (cancel)="toggleEditing()" <sqx-field-form showButtons="true"
[languages]="languages" (dialogClose)="toggleEditing()"
[fieldForm]="editForm.form"
[field]="field" [field]="field"
[schema]="schema" [fieldForm]="editForm.form"
[isEditable]="isEditable" [isEditable]="isEditable"
[isLocalizable]="isLocalizable" [isLocalizable]="isLocalizable"
[languages]="languages"
[schema]="schema"
[settings]="settings"> [settings]="settings">
</sqx-field-form> </sqx-field-form>
</form> </form>
@ -111,11 +112,11 @@
[fields]="nested" [fields]="nested"
[fieldsEmpty]="nested.length === 0" [fieldsEmpty]="nested.length === 0"
[languages]="languages" [languages]="languages"
[parent]="$any(field)"
[schema]="schema" [schema]="schema"
[settings]="settings" [settings]="settings"
[sortable]="isEditable === true" [sortable]="isEditable === true"
(sorted)="sortFields($event)" (sorted)="sortFields($event)">
[parent]="$any(field)">
</sqx-sortable-field-list> </sqx-sortable-field-list>
<div class="nested-field nested-field-add" *ngIf="isEditable"> <div class="nested-field nested-field-add" *ngIf="isEditable">
@ -127,10 +128,10 @@
</div> </div>
<sqx-field-wizard *sqxModal="fieldWizard" <sqx-field-wizard *sqxModal="fieldWizard"
(dialogClose)="fieldWizard.hide()"
[parent]="$any(field)" [parent]="$any(field)"
[schema]="schema" [schema]="schema"
[settings]="settings" [settings]="settings">
(dialogClose)="fieldWizard.hide()">
</sqx-field-wizard> </sqx-field-wizard>
</ng-container> </ng-container>
</div> </div>

5
frontend/src/app/features/schemas/pages/schema/fields/field.component.ts

@ -55,16 +55,13 @@ export class FieldComponent {
this.isEditable = this.field.canUpdate; this.isEditable = this.field.canUpdate;
this.editForm = new EditFieldForm(this.field.properties); this.editForm = new EditFieldForm(this.field.properties);
this.editForm.load(this.field.properties);
} }
} }
public toggleEditing() { public toggleEditing() {
this.isEditing = !this.isEditing; this.isEditing = !this.isEditing;
if (this.isEditing) { this.editForm.load(this.field.properties);
this.editForm.load(this.field.properties);
}
} }
public deleteField() { public deleteField() {

2
frontend/src/app/features/schemas/pages/schema/fields/forms/field-form.component.html

@ -23,7 +23,7 @@
</ul> </ul>
<div class="float-end" *ngIf="showButtons"> <div class="float-end" *ngIf="showButtons">
<button [disabled]="field.isLocked" type="reset" class="btn btn-text-secondary" (click)="dialogClose.emit()"> <button [disabled]="field.isLocked" type="button" class="btn btn-text-secondary" (click)="dialogClose.emit()">
{{ 'common.cancel' | sqxTranslate }} {{ 'common.cancel' | sqxTranslate }}
</button> </button>

2
frontend/src/app/features/settings/pages/clients/client-add-form.component.html

@ -14,7 +14,7 @@
</button> </button>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button type="reset" class="btn btn-text-secondary" (click)="cancel()"> <button type="button" class="btn btn-text-secondary" (click)="cancel()">
{{ 'common.cancel' | sqxTranslate }} {{ 'common.cancel' | sqxTranslate }}
</button> </button>
</div> </div>

2
frontend/src/app/features/settings/pages/languages/language.component.html

@ -27,7 +27,7 @@
<form [formGroup]="editForm.form" (ngSubmit)="save()"> <form [formGroup]="editForm.form" (ngSubmit)="save()">
<div class="table-items-row-details-tabs clearfix"> <div class="table-items-row-details-tabs clearfix">
<div class="float-end"> <div class="float-end">
<button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()"> <button type="button" class="btn btn-text-secondary" (click)="toggleEditing()">
{{ 'common.cancel' | sqxTranslate }} {{ 'common.cancel' | sqxTranslate }}
</button> </button>

2
frontend/src/app/features/settings/pages/roles/role-add-form.component.html

@ -15,7 +15,7 @@
</button> </button>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button type="reset" class="btn btn-text-secondary" (click)="cancel()"> <button type="button" class="btn btn-text-secondary" (click)="cancel()">
{{ 'common.cancel' | sqxTranslate }} {{ 'common.cancel' | sqxTranslate }}
</button> </button>
</div> </div>

2
frontend/src/app/features/settings/pages/roles/role.component.html

@ -34,7 +34,7 @@
<form (ngSubmit)="save()"> <form (ngSubmit)="save()">
<div class="table-items-row-details-tabs clearfix"> <div class="table-items-row-details-tabs clearfix">
<div class="float-end"> <div class="float-end">
<button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()"> <button type="button" class="btn btn-text-secondary" (click)="toggleEditing()">
{{ 'common.cancel' | sqxTranslate }} {{ 'common.cancel' | sqxTranslate }}
</button> </button>

2
frontend/src/app/features/settings/pages/workflows/workflow.component.html

@ -45,7 +45,7 @@
</ul> </ul>
<div class="float-end"> <div class="float-end">
<button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()"> <button type="button" class="btn btn-text-secondary" (click)="toggleEditing()">
{{ 'common.cancel' | sqxTranslate }} {{ 'common.cancel' | sqxTranslate }}
</button> </button>

2
frontend/src/app/shared/components/forms/geolocation-editor.component.html

@ -29,7 +29,7 @@
</div> </div>
<div class="form-group col-auto" *ngIf="!snapshot.isCompact"> <div class="form-group col-auto" *ngIf="!snapshot.isCompact">
<button [class.hidden]="!hasValue" type="reset" class="btn btn-text clear" [disabled]="snapshot.isDisabled" (click)="clearValue()"> <button [class.hidden]="!hasValue" type="button" class="btn btn-text clear" [disabled]="snapshot.isDisabled" (click)="clearValue()">
{{ 'common.clear' | sqxTranslate }} {{ 'common.clear' | sqxTranslate }}
</button> </button>
</div> </div>

Loading…
Cancel
Save