diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index f5a4414756..74a3f7183e 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -4,7 +4,7 @@ import { Collection } from './core/shared/collection.model'; import { Item } from './core/shared/item.model'; import { getCommunityPageRoute } from './community-page/community-page-routing-paths'; import { getCollectionPageRoute } from './collection-page/collection-page-routing-paths'; -import { getItemPageRoute } from './item-page/item-page-routing-paths'; +import { getItemModuleRoute, getItemPageRoute } from './item-page/item-page-routing-paths'; import { hasValue } from './shared/empty.util'; import { URLCombiner } from './core/url-combiner/url-combiner'; @@ -22,8 +22,9 @@ export function getBitstreamModuleRoute() { export function getBitstreamDownloadRoute(bitstream): string { return new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(); } -export function getBitstreamRequestACopyRoute(bitstream): string { - return new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'request-a-copy').toString(); +export function getBitstreamRequestACopyRoute(item, bitstream): string { + const url = new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(); + return `${url}?bitstream=${bitstream.uuid}`; } export const ADMIN_MODULE_PATH = 'admin'; diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts index 1027c85b46..f0b6e3c6de 100644 --- a/src/app/bitstream-page/bitstream-page-routing.module.ts +++ b/src/app/bitstream-page/bitstream-page-routing.module.ts @@ -45,14 +45,6 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations'; bitstream: BitstreamPageResolver }, }, - { - // Resolve angular bitstream download URLs - path: ':id/request-a-copy', - component: BitstreamRequestACopyPageComponent, - resolve: { - bitstream: BitstreamPageResolver - }, - }, { path: EDIT_BITSTREAM_PATH, component: EditBitstreamPageComponent, diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html index c5393055df..33acd6650b 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html @@ -33,7 +33,7 @@
{{'bitstream-request-a-copy.intro' | translate}}
-{{itemName}}
+{{'bitstream-request-a-copy.intro' | translate}} {{itemName}}
+{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}
+{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}