From: Bill Erickson Date: Fri, 2 Aug 2019 15:57:27 +0000 (-0400) Subject: LP1838784 Angular org selector required option X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fberick%2Flp1838784-org-select-required;p=working%2FEvergreen.git 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 --- 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 fc11eee6c2..5c64909cfc 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 @@ -66,6 +66,7 @@ domId="{{idPrefix}}-{{field.name}}" [limitPerms]="modePerms[mode]" [readOnly]="field.readOnly" + [required]="field.isRequired()" [applyDefault]="field.orgDefaultAllowed" [initialOrgId]="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 d49217c6fb..3d5c7853ef 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 dee3248939..0d61efe3d8 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 @@ -33,6 +33,8 @@ export class OrgSelectComponent implements OnInit { // Disable the entire input @Input() disabled: boolean; + @Input() required: boolean; + @ViewChild('instance') instance: NgbTypeahead; // Placeholder text for selector input