From 092dd5188780637dafb6db73c5163fddc8c1090b Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 9 Jan 2019 17:13:43 -0500
Subject: [PATCH] LP1811156 Activate Angular server admin page
Point Admin -> Server Admin from AngJS and Angular navbars to the
Angular version of the server admin splash page.
Includes Angular auto-admin page sanity check for cases where a route
has no extra data.
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts | 4 +++-
Open-ILS/src/eg2/src/app/staff/nav.component.html | 6 ------
Open-ILS/src/templates/staff/navbar.tt2 | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
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 84219f1338..d47d92a94c 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
@@ -55,7 +55,9 @@ export class BasicAdminPageComponent implements OnInit {
}
// Pass the readonlyFields param if available
- if (this.route.snapshot.data[0].readonlyFields) {
+ if (this.route.snapshot.data &&
+ this.route.snapshot.data.length &&
+ this.route.snapshot.data[0].readonlyFields) {
this.readonlyFields = this.route.snapshot.data[0].readonlyFields;
}
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 7c30c00bc4..b43d8e79da 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -336,17 +336,11 @@
<span class="material-icons">person</span>
<span i18n>User Permission Editor</span>
</a>
- <!-- Angular version
<a class="dropdown-item"
routerLink="/staff/admin/server/splash">
<span class="material-icons">account_balance</span>
<span i18n>Server Administration</span>
</a>
- -->
- <a class="dropdown-item" href="/eg/staff/admin/server/index">
- <span class="material-icons">account_balance</span>
- <span i18n>Server Administration</span>
- </a>
<a class="dropdown-item" href="/eg/staff/admin/local/index">
<span class="material-icons">landscape</span>
<span i18n>Local Administration</span>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 1ca59d57d6..ee48e6bd7b 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -484,7 +484,7 @@
</a>
</li>
<li>
- <a href="./admin/server/index" target="_self">
+ <a href="/eg2/staff/admin/server/splash">
<span class="glyphicon glyphicon-briefcase"></span>
[% l('Server Administration') %]
</a>
--
2.11.0