mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

Rename user.unreadNotificationsCount

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 21:36:33 +09:30
parent f9bab0822e
commit eb5b3a0484
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/src/common/models/User.js
View File

@@ -22,7 +22,7 @@ Object.assign(User.prototype, {
joinTime: Model.attribute('joinTime', Model.transformDate),
lastSeenAt: Model.attribute('lastSeenAt', Model.transformDate),
markedAllAsReadAt: Model.attribute('markedAllAsReadAt', Model.transformDate),
unreadNotificationsCount: Model.attribute('unreadNotificationsCount'),
unreadNotificationCount: Model.attribute('unreadNotificationCount'),
newNotificationsCount: Model.attribute('newNotificationsCount'),
discussionCount: Model.attribute('discussionCount'),

2
framework/core/js/src/forum/components/Notification.js
View File

@@ -79,7 +79,7 @@ export default class Notification extends Component {
markAsRead() {
if (this.props.notification.isRead()) return;
app.session.user.pushAttributes({unreadNotificationsCount: app.session.user.unreadNotificationsCount() - 1});
app.session.user.pushAttributes({unreadNotificationCount: app.session.user.unreadNotificationCount() - 1});
this.props.notification.save({isRead: true});
}

2
framework/core/js/src/forum/components/NotificationList.js
View File

@@ -191,7 +191,7 @@ export default class NotificationList extends Component {
markAllAsRead() {
if (!app.cache.notifications) return;
app.session.user.pushAttributes({unreadNotificationsCount: 0});
app.session.user.pushAttributes({unreadNotificationCount: 0});
app.cache.notifications.forEach(notifications => {
notifications.forEach(notification => notification.pushAttributes({isRead: true}))

2
framework/core/js/src/forum/components/NotificationsDropdown.js
View File

@@ -62,7 +62,7 @@ export default class NotificationsDropdown extends Dropdown {
}
getUnreadCount() {
return app.session.user.unreadNotificationsCount();
return app.session.user.unreadNotificationCount();
}
getNewCount() {