diff --git a/src/frontend/app/administration/customField/custom-fields-administration.component.html b/src/frontend/app/administration/customField/custom-fields-administration.component.html index 63165148811d5f9007ceedfe2edf100004c58a75..73a0d4e473191600b0afcfdce2359d70ac3b01a1 100644 --- a/src/frontend/app/administration/customField/custom-fields-administration.component.html +++ b/src/frontend/app/administration/customField/custom-fields-administration.component.html @@ -62,8 +62,8 @@ </div> </div> <div class="col-md-12"> - <mat-form-field *ngFor="let value of custom.values;let i=index;"> - <input matInput [(ngModel)]="value.label"> + <mat-form-field *ngFor="let value of custom.values;let i=index;" floatLabel="never"> + <input matInput [(ngModel)]="value.label" [placeholder]="this.lang.newValue"> <button color="warn" mat-icon-button matSuffix [title]="lang.delete" (click)="removeValue(custom, i)"> <mat-icon class="fa fa-trash"></mat-icon> diff --git a/src/frontend/app/administration/customField/custom-fields-administration.component.ts b/src/frontend/app/administration/customField/custom-fields-administration.component.ts index f9f5ce8a07e99e94ca6aee15f0ac555b15384619..f026508547e5814c0baee51f3450d03152f51a02 100644 --- a/src/frontend/app/administration/customField/custom-fields-administration.component.ts +++ b/src/frontend/app/administration/customField/custom-fields-administration.component.ts @@ -134,7 +134,7 @@ export class CustomFieldsAdministrationComponent implements OnInit { addValue(indexCustom: number) { this.customFields[indexCustom].values.push( { - label: this.lang.newValue + label: '' } ); } @@ -162,6 +162,8 @@ export class CustomFieldsAdministrationComponent implements OnInit { updateCustomField(customField: any, indexCustom: number) { + customField.values = customField.values.filter((x: any, i: any, a: any) => a.map((info: any) => info.label).indexOf(x.label) == i); + // TO FIX DATA BINDING SIMPLE ARRAY VALUES const customFieldToUpdate = { ...customField }; @@ -175,7 +177,7 @@ export class CustomFieldsAdministrationComponent implements OnInit { this.http.put('../../rest/customFields/' + customField.id, customFieldToUpdate).pipe( tap(() => { - this.customFieldsClone[indexCustom] = customField; + this.customFieldsClone[indexCustom] = JSON.parse(JSON.stringify(customField)); this.notify.success(this.lang.customFieldUpdated); }), catchError((err: any) => { @@ -190,7 +192,7 @@ export class CustomFieldsAdministrationComponent implements OnInit { } isModified(customField: any, indexCustomField: number) { - if (JSON.stringify(customField) === JSON.stringify(this.customFieldsClone[indexCustomField])) { + if (JSON.stringify(customField) === JSON.stringify(this.customFieldsClone[indexCustomField]) || customField.label === '') { return true; } else { return false;