mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-08 10:34:15 +00:00
Merge branch 'w2p-120109_fix-findByHref-and-findListByHref-skipping-their-response_contribute-7.6' into dspace-7_x
# Conflicts: # src/app/core/data/base/base-data.service.spec.ts # src/app/core/data/base/base-data.service.ts # src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
This commit is contained in:
@@ -48,7 +48,6 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
|
||||
resolve: {
|
||||
dso: CommunityPageResolver,
|
||||
breadcrumb: CommunityBreadcrumbResolver,
|
||||
menu: DSOEditMenuResolver
|
||||
},
|
||||
runGuardsAndResolvers: 'always',
|
||||
children: [
|
||||
@@ -68,6 +67,9 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
|
||||
path: '',
|
||||
component: ThemedCommunityPageComponent,
|
||||
pathMatch: 'full',
|
||||
resolve: {
|
||||
menu: DSOEditMenuResolver,
|
||||
},
|
||||
}
|
||||
],
|
||||
data: {
|
||||
|
Reference in New Issue
Block a user