Skip to content
Snippets Groups Projects
Commit 5800f8aa authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch 'staging' into 'master'

Staging

See merge request arsnova/frag.jetzt!665
parents 1703bd96 e979d4b5
Branches
Tags
No related merge requests found
...@@ -181,6 +181,7 @@ export class TagCloudDataService { ...@@ -181,6 +181,7 @@ export class TagCloudDataService {
this._currentOwner = roomOwner; this._currentOwner = roomOwner;
this._moderatorService.get(roomId).subscribe(moderators => { this._moderatorService.get(roomId).subscribe(moderators => {
this._currentModerators = moderators.map(moderator => moderator.accountId); this._currentModerators = moderators.map(moderator => moderator.accountId);
this.rebuildTagData();
}); });
this._lastFetchedComments = null; this._lastFetchedComments = null;
this._subscriptionAdminData = this._tagCloudAdmin.getAdminData.subscribe(adminData => { this._subscriptionAdminData = this._tagCloudAdmin.getAdminData.subscribe(adminData => {
...@@ -355,7 +356,7 @@ export class TagCloudDataService { ...@@ -355,7 +356,7 @@ export class TagCloudDataService {
} }
private rebuildTagData() { private rebuildTagData() {
if (!this._lastFetchedComments) { if (!this._lastFetchedComments || !this._currentModerators) {
return; return;
} }
const currentMeta = this._isDemoActive ? this._lastMetaData : this._currentMetaData; const currentMeta = this._isDemoActive ? this._lastMetaData : this._currentMetaData;
......
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