Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Port dspace-7_x] Fix some routes not using the correct baseHref #2521

Merged
merged 1 commit into from
Sep 26, 2023
Merged

[Port dspace-7_x] Fix some routes not using the correct baseHref #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...age/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="{{columnSizes.columns[3].buildClasses()}} row-element d-flex align-items-center">
<div class="text-center w-100">
<div class="btn-group relationship-action-buttons">
<a *ngIf="bitstreamDownloadUrl != null" [href]="bitstreamDownloadUrl"
<a *ngIf="bitstreamDownloadUrl != null" [routerLink]="bitstreamDownloadUrl"
class="btn btn-outline-primary btn-sm"
title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
[attr.data-test]="'download-button' | dsBrowserOnly">
Expand Down
6 changes: 5 additions & 1 deletion .../edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-dat
import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
import { By } from '@angular/platform-browser';
import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe';
import { RouterTestingModule } from '@angular/router/testing';

let comp: ItemEditBitstreamComponent;
let fixture: ComponentFixture<ItemEditBitstreamComponent>;
Expand Down Expand Up @@ -72,7 +73,10 @@ describe('ItemEditBitstreamComponent', () => {
);

TestBed.configureTestingModule({
imports: [TranslateModule.forRoot()],
imports: [
RouterTestingModule.withRoutes([]),
TranslateModule.forRoot(),
],
declarations: [
ItemEditBitstreamComponent,
VarDirective,
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/cookies/klaro-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics';
export const klaroConfiguration: any = {
storageName: ANONYMOUS_STORAGE_NAME_KLARO,

privacyPolicy: '/info/privacy',
privacyPolicy: './info/privacy',

/*
Setting 'hideLearnMore' to 'true' will hide the "learn more / customize" link in
Expand Down
Loading