From 04e47df64de8c2e4b529cd26f42bb72612a2c436 Mon Sep 17 00:00:00 2001
From: Ruben Bimberg <ruben.bimberg@mni.thm.de>
Date: Tue, 29 Jun 2021 14:15:55 +0200
Subject: [PATCH] Correct order of option buttons
[Ticket: #155]
---
src/app/components/shared/header/header.component.html | 4 ++--
src/app/services/util/room-data.service.ts | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 44c75d4a9..78ed4559a 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -200,7 +200,7 @@
</ng-container>
<!-- Session -->
- <ng-container *ngIf="!router.url.endsWith('/comments') && !router.url.includes('/comment/')">
+ <ng-container *ngIf="!router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
<!-- app-room-participant-page -->
<ng-container *ngIf="router.url.includes('/participant/room/')">
@@ -241,7 +241,7 @@
<!-- Room General Options - bot -->
<ng-container
- *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.includes('/comment/')">
+ *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
<button mat-menu-item
*ngIf="user"
diff --git a/src/app/services/util/room-data.service.ts b/src/app/services/util/room-data.service.ts
index f8f2c0f0f..130d7e17d 100644
--- a/src/app/services/util/room-data.service.ts
+++ b/src/app/services/util/room-data.service.ts
@@ -119,6 +119,9 @@ export class RoomDataService {
getRoomData(roomId: string, freezed: boolean = false): Observable<Comment[]> {
const tempSubject = new BehaviorSubject<Comment[]>(null);
+ if (this._currentRoomId !== roomId) {
+ this._commentUpdates.next(null);
+ }
const subscription = this._commentUpdates.subscribe(comments => {
if (comments === null) {
return;
--
GitLab