From 582be6d8c6cbfabef5962bcb6f35679477c367a0 Mon Sep 17 00:00:00 2001
From: Michael Breu <Michael.Breu@arctis.at>
Date: Tue, 19 Jul 2022 09:51:28 +0200
Subject: [PATCH] Still fixing encoding problems
---
.../exercise-metadata/exercise-metadata.component.html | 2 +-
.../exercise-metadata/exercise-metadata.component.ts | 4 ++++
src/main/webapp/app/exercisePage/exercise.route.ts | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
index 1b8faf0ce..d8df9c496 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
+++ b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
@@ -116,7 +116,7 @@
<jhi-exercise-metadata-item
[description]="'exercise.metadata.internalIdentifier'"
[value]="exercise.originalResult.exerciseId"
- link="/item/{{ encodeURI(exercise.originalResult.exerciseId) }}"
+ link="/item/{{ encodeURIforExerciseId(exercise.originalResult.exerciseId) }}"
>
</jhi-exercise-metadata-item>
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
index be1bff63c..4d276205b 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
+++ b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
@@ -1,5 +1,7 @@
import { Component, OnInit, OnDestroy, Input } from '@angular/core';
import { Exercise } from 'app/shared/model/exercise.model';
+import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service';
+
import { Person } from 'app/shared/model/person.model';
import { Subscription } from 'rxjs';
import { Account } from 'app/core/auth/account.model';
@@ -14,6 +16,8 @@ export class ExerciseMetadataComponent implements OnInit, OnDestroy {
@Input() exercise: Exercise | undefined;
account: Account | null = null;
authSubscription?: Subscription;
+
+ encodeURIforExerciseId = encodeURIforExerciseId; // just make it available for template
constructor(private accountService: AccountService) {}
diff --git a/src/main/webapp/app/exercisePage/exercise.route.ts b/src/main/webapp/app/exercisePage/exercise.route.ts
index fc178b887..c97a26260 100644
--- a/src/main/webapp/app/exercisePage/exercise.route.ts
+++ b/src/main/webapp/app/exercisePage/exercise.route.ts
@@ -13,7 +13,7 @@ export class ExerciseResolve implements Resolve<String> {
subUrl += route.url[i].path;
verkett = '/';
}
- if (subUrl === '') return of('helpStart');
+ if (subUrl === '') return of('');
return of(subUrl);
}
}
--
GitLab