Skip to content
Snippets Groups Projects
Commit 69a0401f authored by Lukas Mauß's avatar Lukas Mauß
Browse files

Merge remote-tracking branch 'origin/master'

Merge fix for feedback
parents c593ce25 19a4e021
No related merge requests found
......@@ -34,7 +34,7 @@ export class NewLandingComponent implements OnInit {
}
createSession() {
if (!this.user || this.user.isGuest) {
if (!this.user) {
this.openLoginDialog();
} else {
this.openCreateRoomDialog();
......@@ -56,7 +56,7 @@ export class NewLandingComponent implements OnInit {
dialogRef.componentInstance.guestAllowed = this.authentication.lecturer.allowGuest;
dialogRef.afterClosed()
.subscribe(result => {
if (this.user && !this.user.isGuest) {
if (this.user) {
this.openCreateRoomDialog();
}
});
......
......@@ -30,7 +30,7 @@
</mat-grid-tile>
<mat-grid-tile>
<button mat-icon-button color="primary" matTooltip="{{ 'room-page.give-feedback' | translate}}"
routerLink="/participant/room/{{ room.id }}/feedback-barometer">
routerLink="/participant/room/{{ room.shortId }}/feedback-barometer">
<mat-icon>thumbs_up_down</mat-icon>
</button>
</mat-grid-tile>
......
......@@ -30,7 +30,7 @@ export class FeedbackBarometerPageComponent implements OnInit {
private notification: NotificationService,
private rxStompService: RxStompService,
private route: ActivatedRoute, ) {
this.roomId = this.route.snapshot.params.roomId;
this.roomId = localStorage.getItem(`roomId`);
}
ngOnInit() {
......
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