From cefbb39a6548051c3f2d8647705a3ae296e332f5 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 2 Aug 2019 11:57:27 -0400 Subject: [PATCH] LP1838784 Angular org selector required option Support marking an org unit selector as required. Teach the Fielmapper Editor to pass the requiredness value to any org selectors it renders. Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html | 1 + Open-ILS/src/eg2/src/app/share/org-select/org-select.component.html | 1 + Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html index d831cab471..ba9b44904e 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html @@ -84,6 +84,7 @@ domId="{{idPrefix}}-{{field.name}}" [limitPerms]="modePerms[mode]" [readOnly]="field.readOnly" + [required]="field.isRequired()" [applyDefault]="field.orgDefaultAllowed" [applyOrgId]="record[field.name]()" (onChange)="record[field.name]($event)"> diff --git a/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.html b/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.html index 0a662c0eba..745c75d487 100644 --- a/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.html +++ b/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.html @@ -15,6 +15,7 @@ [attr.id]="domId.length ? domId : null" [placeholder]="placeholder" [disabled]="disabled" + [required]="required" [(ngModel)]="selected" [ngbTypeahead]="filter" [resultTemplate]="displayTemplate" diff --git a/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts b/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts index 93dee2944d..8ee14751f4 100644 --- a/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts +++ b/Open-ILS/src/eg2/src/app/share/org-select/org-select.component.ts @@ -51,6 +51,8 @@ export class OrgSelectComponent implements OnInit { // Disable the entire input @Input() disabled: boolean; + @Input() required: boolean; + @ViewChild('instance', { static: false }) instance: NgbTypeahead; // Placeholder text for selector input -- 2.11.0