Skip to content

Commit 7e856ee

Browse files
committed
GND_8: No GND behaviour on relation fields, even if cfg'd as vocab
Bug logged at TLC-900
1 parent 998a3bc commit 7e856ee

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
(selectItem)="onSelectItem($event)"
7272
(keydown.enter)="handleKeyDown($event)"
7373
>
74-
<button *ngIf="(isExternalDataModal() | async) && !(hideRemoveButton)" class="btn btn-primary" [disabled]="disableRemove" (click)="clearGndValue()" title="{{'gnd-lookup.gnd.button.remove' | translate}}"><i class="fas fa-trash"></i></button>
75-
<button *ngIf="(isExternalDataModal() | async)" class="btn btn-primary" (click)="openModal()" title="{{'gnd-lookup.gnd.button.search' | translate}}"><i class="fas fa-search"></i></button>
74+
<button *ngIf="((isExternalDataModal() | async)) && !(hideRemoveButton)" class="btn btn-primary" [disabled]="disableRemove" (click)="clearGndValue()" title="{{'gnd-lookup.gnd.button.remove' | translate}}"><i class="fas fa-trash"></i></button>
75+
<button *ngIf="((isExternalDataModal() | async))" class="btn btn-primary" (click)="openModal()" title="{{'gnd-lookup.gnd.button.search' | translate}}"><i class="fas fa-search"></i></button>
7676
</div>
7777
<div class="invalid-feedback" *ngIf="searchFailed && !(isExternalDataModal() | async)">Sorry, suggestions could not be loaded.</div>
7878
</div>

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
196196
);
197197

198198
this.isExternalDataModal$ = this.vocabulary$.pipe(
199-
map((result: Vocabulary) => result.externalDataModal)
199+
map((result: Vocabulary) => {
200+
return (!this.isRelationship && result.externalDataModal)
201+
})
200202
);
201203

202204
this.subs.push(this.group.get(this.model.id).valueChanges.pipe(
@@ -476,4 +478,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
476478
this.formBuilderService.addOrUpdateRemoveButtonStatus(key, value);
477479
}
478480

481+
get isRelationship() {
482+
return hasValue(this.model.relationship);
483+
}
479484
}

0 commit comments

Comments
 (0)