github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 08:09:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: currentUser might be undefined (#9555)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-04-28 07:55:06 +02:00 committed by GitHub
parent d3dc8fc1b3
commit 23ff071ebd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/site-header.js
View File

@ -215,8 +215,8 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
if (
!e.target.closest("#current-user") &&
!e.target.closest(".ring-backdrop") &&
!this.currentUser.get("read_first_notification") &&
!this.currentUser.get("enforcedSecondFactor")
!this.get("currentUser.read_first_notification") &&
!this.get("currentUser.enforcedSecondFactor")
) {
this.eventDispatched(
"header:dismiss-first-notification-mask",

2
app/assets/javascripts/discourse/app/widgets/header.js
View File

@ -539,7 +539,7 @@ export default createWidget("header", {
"notification",
{
recent: true,
silent: this.currentUser.enforcedSecondFactor,
silent: this.get("currentUser.enforcedSecondFactor"),
limit: 5
},
{ cacheKey: "recent-notifications" }