From 85404e5f698366af11e08782b15c1521f7ad0677 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 6 Jun 2018 14:35:49 -0400 Subject: [PATCH] LP#1626157 ACQ admin splash page and IU's Angular6 versions of all ACQ admin UI's, minus the funds page, which requires some additional features. Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts | 7 ++++++- Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts | 3 +++ Open-ILS/src/eg2/src/app/staff/nav.component.html | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts index e2a64f5b15..aa24cc7773 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts @@ -25,7 +25,12 @@ export class BasicAdminPageComponent implements OnInit { } ngOnInit() { - const schema = this.route.snapshot.paramMap.get('schema'); + let schema = this.route.snapshot.paramMap.get('schema'); + if (!schema) { + // Allow callers to pass the schema via static route data + const data = this.route.snapshot.data[0]; + if (data) { schema = data.schema; } + } const table = schema + '.' + this.route.snapshot.paramMap.get('table'); Object.keys(this.idl.classes).forEach(class_ => { diff --git a/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts index 77b2d8a1fa..a93f9ee37c 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts @@ -9,6 +9,9 @@ const routes: Routes = [{ }, { path: 'server', loadChildren: '@eg/staff/admin/server/admin-server.module#AdminServerModule' + }, { + path: 'acq', + loadChildren: '@eg/staff/admin/acq/admin-acq.module#AdminAcqModule' }] }]; diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html index e3b60b3635..e60b8eb9b0 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.html +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html @@ -245,6 +245,11 @@ account_balance Server Administration + + attach_money + Acquisitions Administration + -- 2.11.0