From 9edf2406d9ac5601afe9c5955c31dfc3c76900d7 Mon Sep 17 00:00:00 2001
From: Ruben Bimberg <ruben.bimberg@mni.thm.de>
Date: Thu, 7 Oct 2021 13:55:50 +0200
Subject: [PATCH] Fix moderator bug
---
.../room-creator-page.component.ts | 6 +++---
.../components/shared/header/header.component.html | 14 +++++++++++++-
.../components/shared/header/header.component.ts | 2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
index a79feab2c..e2b51f088 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -348,13 +348,13 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni
updateCommentSettings(settings: CommentSettingsDialog){
this.room.tags = settings.tags;
- if (this.moderationEnabled && !settings.enableModeration){
+ if (this.moderationEnabled && settings.directSend){
this.viewModuleCount = this.viewModuleCount - 1;
- }else if (!this.moderationEnabled && settings.enableModeration){
+ }else if (!this.moderationEnabled && !settings.directSend){
this.viewModuleCount = this.viewModuleCount + 1;
}
- this.moderationEnabled = settings.enableModeration;
+ this.moderationEnabled = !settings.directSend;
localStorage.setItem('moderationEnabled', String(this.moderationEnabled));
}
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index f864a0202..f0e6149f8 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -43,6 +43,17 @@
{{cTime}}
</h2>
+ <span class="fill-remaining-space"
+ *ngIf="moderationEnabled && deviceType === 'desktop' && router.url.includes('comments')"></span>
+ <span
+ *ngIf="moderationEnabled && router.url.includes('comments')"
+ class="moderation-enabled"
+ fxLayoutAlign="center center">
+ <mat-icon matTooltip="{{ 'header.moderation-enabled' | translate }}">
+ gavel
+ </mat-icon>
+ </span>
+
<span class="fill-remaining-space"
*ngIf="room && room.questionsBlocked"></span>
@@ -219,7 +230,8 @@
</ng-container>
<!-- Session -->
- <ng-container *ngIf="!router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
+ <ng-container
+ *ngIf="!router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
<!-- app-room-creator-page -->
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index 91b73f704..c5cc6f7d4 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -154,7 +154,7 @@ export class HeaderComponent implements OnInit,AfterViewInit {
const message = JSON.parse(msg.body);
if (message.type === 'RoomPatched') {
this.room.questionsBlocked = message.payload.changes.questionsBlocked;
- this.moderationEnabled = message.payload.changes.moderated;
+ this.moderationEnabled = !message.payload.changes.directSend;
}
});
});
--
GitLab