github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-22 22:07:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename discussion.lastTime

Browse Source
This commit is contained in:
Toby Zerner 2018-08-24 20:49:06 +09:30
parent e9cd9575f5
commit 2ba550afa7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/js/src/common/models/Discussion.js
View File

@ -13,7 +13,7 @@ Object.assign(Discussion.prototype, {
user: Model.hasOne('user'), user: Model.hasOne('user'),
firstPost: Model.hasOne('firstPost'), firstPost: Model.hasOne('firstPost'),
lastTime: Model.attribute('lastTime', Model.transformDate), lastPostedAt: Model.attribute('lastPostedAt', Model.transformDate),
lastPostedUser: Model.hasOne('lastPostedUser'), lastPostedUser: Model.hasOne('lastPostedUser'),
lastPost: Model.hasOne('lastPost'), lastPost: Model.hasOne('lastPost'),
lastPostNumber: Model.attribute('lastPostNumber'), lastPostNumber: Model.attribute('lastPostNumber'),
@ -67,7 +67,7 @@ Object.assign(Discussion.prototype, {
unreadCount() { unreadCount() {
const user = app.session.user; const user = app.session.user;
if (user && user.readTime() < this.lastTime()) { if (user && user.readTime() < this.lastPostedAt()) {
return Math.max(0, this.lastPostNumber() - (this.readNumber() || 0)); return Math.max(0, this.lastPostNumber() - (this.readNumber() || 0));
} }

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

@ -16,7 +16,7 @@ export default class TerminalPost extends Component {
const lastPost = this.props.lastPost && discussion.repliesCount(); const lastPost = this.props.lastPost && discussion.repliesCount();
const user = discussion[lastPost ? 'lastPostedUser' : 'user'](); const user = discussion[lastPost ? 'lastPostedUser' : 'user']();
const time = discussion[lastPost ? 'lastTime' : 'createdAt'](); const time = discussion[lastPost ? 'lastPostedAt' : 'createdAt']();
return ( return (
<span> <span>

2
framework/core/src/Api/Serializer/DiscussionSerializer.php
View File

@ -40,7 +40,7 @@ class DiscussionSerializer extends BasicDiscussionSerializer
'commentCount' => (int) $discussion->comment_count, 'commentCount' => (int) $discussion->comment_count,
'participantCount' => (int) $discussion->participant_count, 'participantCount' => (int) $discussion->participant_count,
'createdAt' => $this->formatDate($discussion->created_at), 'createdAt' => $this->formatDate($discussion->created_at),
'lastTime' => $this->formatDate($discussion->last_posted_at), 'lastPostedAt' => $this->formatDate($discussion->last_posted_at),
'lastPostNumber' => (int) $discussion->last_post_number, 'lastPostNumber' => (int) $discussion->last_post_number,
'canReply' => $gate->allows('reply', $discussion), 'canReply' => $gate->allows('reply', $discussion),
'canRename' => $gate->allows('rename', $discussion), 'canRename' => $gate->allows('rename', $discussion),