From: Bill Erickson Date: Fri, 16 Aug 2019 20:01:54 +0000 (-0400) Subject: LP1840050 org unit admin UI WIP X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=05bfe21e7e0188b906199d838f08fe34d51eb8de;p=working%2FEvergreen.git LP1840050 org unit admin UI WIP Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 9e7dc25f89..7edfdf4f10 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -72,7 +72,7 @@ export class ComboboxComponent implements ControlValueAccessor, OnInit { // Allow the selected entry ID to be passed via the template // This does NOT not emit onChange events. @Input() set selectedId(id: any) { - if (id) { + if (id) { if (this.entrylist.length) { this.selected = this.entrylist.filter(e => e.id === id)[0]; } diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.ts index 3b4a498bc6..c6ddc3c4d3 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.ts @@ -8,7 +8,7 @@ const ADDR_TYPES = ['billing_address', 'holds_address', 'mailing_address', 'ill_address']; @Component({ - selector: 'eg-admin-org-address', + selector: 'eg-admin-org-address', templateUrl: './org-addr.component.html' }) export class OrgAddressComponent { @@ -46,7 +46,7 @@ export class OrgAddressComponent { if (!this.orgId) { return; } return this.pcrud.retrieve('aou', this.orgId, - {flesh : 1, flesh_fields : {aou : ADDR_TYPES}}, + {flesh : 1, flesh_fields : {aou : ADDR_TYPES}}, {authoritative: true} ).subscribe(org => { this.orgUnit = org; @@ -84,7 +84,7 @@ export class OrgAddressComponent { // Find the address let fromAddr: IdlObject; ADDR_TYPES.forEach(aType => { - if (aType !== addrType && + if (aType !== addrType && this.addr(aType).id() === this.addr(addrType).id()) { fromAddr = this.addr(aType); } diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts index 60bf2c9436..3c076551b1 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts @@ -11,7 +11,7 @@ const routes: Routes = [{ }, { path: 'actor/org_unit_type', component: OrgUnitTypeComponent -}, { +}, { path: 'actor/org_unit', loadChildren: '@eg/staff/admin/server/org-unit.module#OrgUnitModule' }, {