mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-26 03:01:22 +02:00
Code Issues Releases Wiki Activity

Rename notification.sender

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 21:46:28 +09:30
parent 3a21b44a71
commit f0d296bfb0
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,6 @@ Object.assign(Notification.prototype, {
additionalUnreadCount: computed('unreadCount', unreadCount => Math.max(0, unreadCount - 1)),
user: Model.hasOne('user'),
sender: Model.hasOne('sender'),
fromUser: Model.hasOne('fromUser'),
subject: Model.hasOne('subject')
});

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

@@ -20,6 +20,6 @@ export default class DiscussionRenamedNotification extends Notification {
}
content() {
return app.translator.trans('core.forum.notifications.discussion_renamed_text', {user: this.props.notification.sender()});
return app.translator.trans('core.forum.notifications.discussion_renamed_text', {user: this.props.notification.fromUser()});
}
}

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

@@ -26,7 +26,7 @@ export default class Notification extends Component {
if (!isInitialized) $(element).click(this.markAsRead.bind(this));
}}>
{avatar(notification.sender())}
{avatar(notification.fromUser())}
{icon(this.icon(), {className: 'Notification-icon'})}
<span className="Notification-content">{this.content()}</span>
{humanTime(notification.createdAt())}