hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts after alignment with main

Browse Source
This commit is contained in:
FrancescoMolinaro
2024-02-29 09:04:17 +01:00
parent 6fc4c05627
commit cd6a00e48b
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/admin/admin-routing-paths.ts
View File

@@ -5,6 +5,8 @@ import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifi
export const REGISTRIES_MODULE_PATH = 'registries'; export const REGISTRIES_MODULE_PATH = 'registries';
export const NOTIFICATIONS_MODULE_PATH = 'notifications'; export const NOTIFICATIONS_MODULE_PATH = 'notifications';
export const LDN_PATH = 'ldn'; export const LDN_PATH = 'ldn';
export const REPORTS_MODULE_PATH = 'reports';
export function getRegistriesModuleRoute() { export function getRegistriesModuleRoute() {
@@ -22,3 +24,7 @@ export function getNotificationsModuleRoute() {
export function getNotificatioQualityAssuranceRoute() { export function getNotificatioQualityAssuranceRoute() {
return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString(); return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString();
} }
export function getReportsModuleRoute() {
return new URLCombiner(getAdminModuleRoute(), REPORTS_MODULE_PATH).toString();
}

11
src/app/admin/admin-routing.module.ts
View File

@@ -6,7 +6,11 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component'; import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component'; import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
import { LDN_PATH, NOTIFICATIONS_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths'; import {
LDN_PATH,
NOTIFICATIONS_MODULE_PATH,
REGISTRIES_MODULE_PATH, REPORTS_MODULE_PATH,
} from './admin-routing-paths';
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
import { import {
SiteAdministratorGuard SiteAdministratorGuard
@@ -79,6 +83,11 @@ import {
} }
], ],
}, },
{
path: REPORTS_MODULE_PATH,
loadChildren: () => import('./admin-reports/admin-reports.module')
.then((m) => m.AdminReportsModule),
},
]) ])
], ],
providers: [ providers: [