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

Rename discussion.startTime

Browse Source
This commit is contained in:
Toby Zerner 2018-08-24 20:48:04 +09:30
parent 4756bf1daf
commit 568006fe73
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/common/models/Discussion.js
View File

@ -9,7 +9,7 @@ Object.assign(Discussion.prototype, {
title: Model.attribute('title'),
slug: Model.attribute('slug'),
startTime: Model.attribute('startTime', Model.transformDate),
createdAt: Model.attribute('createdAt', Model.transformDate),
user: Model.hasOne('user'),
firstPost: Model.hasOne('firstPost'),

2
js/src/forum/components/DiscussionListItem.js
View File

@ -95,7 +95,7 @@ export default class DiscussionListItem extends Component {
<div className={'DiscussionListItem-content Slidable-content' + (isUnread ? ' unread' : '') + (isRead ? ' read' : '')}>
<a href={user ? app.route.user(user) : '#'}
className="DiscussionListItem-author"
title={extractText(app.translator.trans('core.forum.discussion_list.started_text', {user: user, ago: humanTime(discussion.startTime())}))}
title={extractText(app.translator.trans('core.forum.discussion_list.started_text', {user: user, ago: humanTime(discussion.createdAt())}))}
config={function(element) {
$(element).tooltip({placement: 'right'});
m.route.apply(this, arguments);

2
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 user = discussion[lastPost ? 'lastPostedUser' : 'user']();
const time = discussion[lastPost ? 'lastTime' : 'startTime']();
const time = discussion[lastPost ? 'lastTime' : 'createdAt']();
return (
<span>

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

@ -39,7 +39,7 @@ class DiscussionSerializer extends BasicDiscussionSerializer
$attributes = parent::getDefaultAttributes($discussion) + [
'commentCount' => (int) $discussion->comment_count,
'participantCount' => (int) $discussion->participant_count,
'startTime' => $this->formatDate($discussion->created_at),
'createdAt' => $this->formatDate($discussion->created_at),
'lastTime' => $this->formatDate($discussion->last_posted_at),
'lastPostNumber' => (int) $discussion->last_post_number,
'canReply' => $gate->allows('reply', $discussion),