From: Ricardo Marques Date: Wed, 13 Jun 2018 17:29:30 +0000 (+0100) Subject: mgr/dashboard: User permissions control (frontend) X-Git-Tag: v14.0.1~1019^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f73119df2ccbe37c1bd97731075efaa42e262b8d;p=ceph.git mgr/dashboard: User permissions control (frontend) Signed-off-by: Ricardo Marques --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts index 03ef61c75128..3ed80e16c40c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts @@ -20,6 +20,7 @@ import { RgwDaemonListComponent } from './ceph/rgw/rgw-daemon-list/rgw-daemon-li import { RgwUserFormComponent } from './ceph/rgw/rgw-user-form/rgw-user-form.component'; import { RgwUserListComponent } from './ceph/rgw/rgw-user-list/rgw-user-list.component'; import { LoginComponent } from './core/auth/login/login.component'; +import { ForbiddenComponent } from './core/forbidden/forbidden.component'; import { NotFoundComponent } from './core/not-found/not-found.component'; import { AuthGuardService } from './shared/services/auth-guard.service'; import { ModuleStatusGuardService } from './shared/services/module-status-guard.service'; @@ -107,6 +108,7 @@ const routes: Routes = [ { path: 'cephfs', component: CephfsListComponent, canActivate: [AuthGuardService] }, { path: 'configuration', component: ConfigurationComponent, canActivate: [AuthGuardService] }, { path: 'mirroring', component: MirroringComponent, canActivate: [AuthGuardService] }, + { path: '403', component: ForbiddenComponent }, { path: '404', component: NotFoundComponent }, { path: 'osd', component: OsdListComponent, canActivate: [AuthGuardService] }, { path: '**', redirectTo: '/404' } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html index 9ee46fab0997..bb52bee45c1a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html @@ -76,15 +76,16 @@
+ *ngIf="mode === 'editing' || !poolPermission.read"> + *ngIf="mode === 'editing' || !poolPermission.read">