From fab19ddf55c1e3f1e61745a676785ff0309f11f2 Mon Sep 17 00:00:00 2001 From: Avan Thakkar Date: Fri, 7 May 2021 15:08:11 +0530 Subject: [PATCH] mgr/dashboard: fix base-href: revert it to previous approach Fixes: https://tracker.ceph.com/issues/50684 Signed-off-by: Avan Thakkar (cherry picked from commit b6f92922f5c80223fd288d98ce85405a650c0135) Conflicts: src/pybind/mgr/dashboard/frontend/src/app/app.module.ts - Adopt the changes coming from master. --- src/pybind/mgr/dashboard/frontend/src/app/app.module.ts | 5 ----- src/pybind/mgr/dashboard/frontend/src/index.html | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts index b4b902aa0b25..1f8e9bf5b162 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts @@ -1,4 +1,3 @@ -import { APP_BASE_HREF } from '@angular/common'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { ErrorHandler, @@ -59,10 +58,6 @@ import { environment } from '../environments/environment'; useClass: ApiInterceptorService, multi: true }, - { - provide: APP_BASE_HREF, - useValue: window['base-href'] - }, { provide: TRANSLATIONS, useFactory: (locale: string) => { diff --git a/src/pybind/mgr/dashboard/frontend/src/index.html b/src/pybind/mgr/dashboard/frontend/src/index.html index 150e67eebcb6..f314e2c53a8f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/index.html +++ b/src/pybind/mgr/dashboard/frontend/src/index.html @@ -3,10 +3,9 @@ Ceph - -- 2.47.3