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

Skip to content
Snippets Groups Projects
Commit 12d3ccfb authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Merge branch '319-Reactivate-rememberme-an-original-URL-from-315' into 'development'

Resolve "Reactivate "RememberMe" functionality and remember URL for reusing after OAuth2 authentication"

See merge request sharing/codeability-sharing-platform!130
parents 7daa2373 0505b0f5
Branches
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
version: '3.5'
services:
gitsearch-app:
image: gitsearch:latest
image: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch
container_name: sharing_search
hostname: sharing_search
environment:
......
......@@ -116,7 +116,7 @@
<jhi-exercise-metadata-item
[description]="'exercise.metadata.internalIdentifier'"
[value]="exercise.originalResult.exerciseId"
link="/item/{{ exercise.originalResult.exerciseId }}"
link="/item/{{ encodeURIforExerciseId(exercise.originalResult.exerciseId) }}"
>
</jhi-exercise-metadata-item>
......
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) {}
......
......@@ -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);
}
}
......
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