hazza/yel-dspace-angular
1
0
Fork 0
forked from hazza/dspace-angular
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/main' into w2p-77205_issue-927-Non-site-admin-edit-authorization-group

Browse Source
This commit is contained in:
Yura Bondarenko
2021-03-30 09:25:11 +02:00
parent 61767c196c e4400acfd7
commit e5d52ce96a
269 changed files with 3344 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/app-routing.module.ts
View File

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
import { AuthenticatedGuard } from './core/auth/authenticated.guard';
import { SiteAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import {
@@ -23,7 +22,8 @@ import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
import { ReloadGuard } from './core/reload/reload.guard';
import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
import { ForbiddenComponent } from './forbidden/forbidden.component';
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
@NgModule({
@@ -32,7 +32,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
path: '', canActivate: [AuthBlockingGuard],
children: [
{ path: '', redirectTo: '/home', pathMatch: 'full' },
{ path: 'reload/:rnd', component: PageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] },
{ path: 'reload/:rnd', component: ThemedPageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] },
{
path: 'home',
loadChildren: () => import('./+home-page/home-page.module')
@@ -175,7 +175,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
},
{
path: FORBIDDEN_PATH,
component: ForbiddenComponent
component: ThemedForbiddenComponent
},
{
path: 'statistics',
@@ -187,7 +187,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
loadChildren: () => import('./access-control/access-control.module').then((m) => m.AccessControlModule),
canActivate: [GroupAdministratorGuard],
},
{ path: '**', pathMatch: 'full', component: PageNotFoundComponent },
{ path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
]}
],{
onSameUrlNavigation: 'reload',