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

79768: Make relative URLs absolute

Browse Source
This commit is contained in:
Yura Bondarenko
2021-06-14 09:48:33 +02:00
parent 2ed16aa66e
commit 64049fdcf7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/core/metadata/metadata.service.ts
View File

@@ -30,6 +30,8 @@ import { BundleDataService } from '../data/bundle-data.service';
import { followLink } from '../../shared/utils/follow-link-config.model'; import { followLink } from '../../shared/utils/follow-link-config.model';
import { Bundle } from '../shared/bundle.model'; import { Bundle } from '../shared/bundle.model';
import { PaginatedList } from '../data/paginated-list.model'; import { PaginatedList } from '../data/paginated-list.model';
import { URLCombiner } from '../url-combiner/url-combiner';
import { HardRedirectService } from '../services/hard-redirect.service';
@Injectable() @Injectable()
export class MetadataService { export class MetadataService {
@@ -64,7 +66,8 @@ export class MetadataService {
private bundleDataService: BundleDataService, private bundleDataService: BundleDataService,
private bitstreamDataService: BitstreamDataService, private bitstreamDataService: BitstreamDataService,
private bitstreamFormatDataService: BitstreamFormatDataService, private bitstreamFormatDataService: BitstreamFormatDataService,
private rootService: RootDataService private rootService: RootDataService,
private hardRedirectService: HardRedirectService,
) { ) {
// TODO: determine what open graph meta tags are needed and whether // TODO: determine what open graph meta tags are needed and whether
// the differ per route. potentially add image based on DSpaceObject // the differ per route. potentially add image based on DSpaceObject
@@ -276,7 +279,7 @@ export class MetadataService {
if (this.currentObject.value instanceof Item) { if (this.currentObject.value instanceof Item) {
let url = this.getMetaTagValue('dc.identifier.uri'); let url = this.getMetaTagValue('dc.identifier.uri');
if (hasNoValue(url)) { if (hasNoValue(url)) {
url = this.router.url; // Google should handle relative URL url = new URLCombiner(this.hardRedirectService.getRequestOrigin(), this.router.url).toString();
} }
this.addMetaTag('citation_abstract_html_url', url); this.addMetaTag('citation_abstract_html_url', url);
} }
@@ -344,7 +347,10 @@ export class MetadataService {
take(1) take(1)
).subscribe((link: string) => { ).subscribe((link: string) => {
// Use the found link to set the <meta> tag // Use the found link to set the <meta> tag
this.addMetaTag('citation_pdf_url', link); this.addMetaTag(
'citation_pdf_url',
new URLCombiner(this.hardRedirectService.getRequestOrigin(), link).toString()
);
}); });
} }
} }