From: Volker Theile <vtheile@suse.com>
Date: Thu, 26 Sep 2019 15:33:24 +0000 (+0200)
Subject: mgr/dashboard: Configuring an URL prefix does not work as expected
X-Git-Tag: v14.2.5~22^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc5e7e472c5a3300384e1213f96b5c228a2030dd;p=ceph.git

mgr/dashboard: Configuring an URL prefix does not work as expected

Fixes: https://tracker.ceph.com/issues/41797

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 5730883b7e7c80d5f3587d1e997343e96668a21a)

Conflicts:
    src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.html
    src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html
  - master is using a newer version of boostrap, had to keep the old
css classes
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.html
index b9284bfdcd6..6187a09bd24 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.html
@@ -4,7 +4,7 @@
     <h4 i18n>Return to <a class="sso-logout" [href]="logoutUrl">Login Page</a>. You'll be logged out from the Identity Provider when you retry logging in.</h4>
 
     <img class="img-responsive center-block img-rounded"
-         src="/assets/1280px-Nautilus_Octopus.jpg">
+         src="assets/1280px-Nautilus_Octopus.jpg">
     <span>
       "<a href="https://www.flickr.com/photos/146401137@N06/40335060661">Nautilus Octopus</a>" by Jin Kemoole is licensed under
       <a rel="nofollow"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html
index daeeaf54fd0..b50478afbd4 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html
@@ -3,7 +3,7 @@
     <h1 i18n>Sorry, we could not find what you were looking for</h1>
 
     <img class="img-responsive center-block img-rounded"
-         src="/assets/1280px-Nautilus_Octopus.jpg">
+         src="assets/1280px-Nautilus_Octopus.jpg">
     <span>
       "<a href="https://www.flickr.com/photos/146401137@N06/40335060661">Nautilus Octopus</a>" by Jin Kemoole is licensed under
       <a rel="nofollow"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.ts
index 50bcc947d69..46f3c8400ce 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.ts
@@ -52,7 +52,7 @@ export class ModuleStatusGuardService implements CanActivate, CanActivateChild {
       return observableOf(true);
     }
     const config = route.data['moduleStatusGuardConfig'];
-    return this.http.get(`/api/${config.apiPath}/status`).pipe(
+    return this.http.get(`api/${config.apiPath}/status`).pipe(
       map((resp: any) => {
         if (!resp.available) {
           this.router.navigate([config.redirectTo, resp.message || '']);