This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 582be6d8 authored by Michael Breu's avatar Michael Breu
Browse files

Still fixing encoding problems

parent ea60bea6
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<jhi-exercise-metadata-item <jhi-exercise-metadata-item
[description]="'exercise.metadata.internalIdentifier'" [description]="'exercise.metadata.internalIdentifier'"
[value]="exercise.originalResult.exerciseId" [value]="exercise.originalResult.exerciseId"
link="/item/{{ encodeURI(exercise.originalResult.exerciseId) }}" link="/item/{{ encodeURIforExerciseId(exercise.originalResult.exerciseId) }}"
> >
</jhi-exercise-metadata-item> </jhi-exercise-metadata-item>
......
import { Component, OnInit, OnDestroy, Input } from '@angular/core'; import { Component, OnInit, OnDestroy, Input } from '@angular/core';
import { Exercise } from 'app/shared/model/exercise.model'; 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 { Person } from 'app/shared/model/person.model';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { Account } from 'app/core/auth/account.model'; import { Account } from 'app/core/auth/account.model';
...@@ -14,6 +16,8 @@ export class ExerciseMetadataComponent implements OnInit, OnDestroy { ...@@ -14,6 +16,8 @@ export class ExerciseMetadataComponent implements OnInit, OnDestroy {
@Input() exercise: Exercise | undefined; @Input() exercise: Exercise | undefined;
account: Account | null = null; account: Account | null = null;
authSubscription?: Subscription; authSubscription?: Subscription;
encodeURIforExerciseId = encodeURIforExerciseId; // just make it available for template
constructor(private accountService: AccountService) {} constructor(private accountService: AccountService) {}
......
...@@ -13,7 +13,7 @@ export class ExerciseResolve implements Resolve<String> { ...@@ -13,7 +13,7 @@ export class ExerciseResolve implements Resolve<String> {
subUrl += route.url[i].path; subUrl += route.url[i].path;
verkett = '/'; verkett = '/';
} }
if (subUrl === '') return of('helpStart'); if (subUrl === '') return of('');
return of(subUrl); return of(subUrl);
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment