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

Rename discussion.startTime

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 20:48:04 +09:30
parent 350d162d81
commit e9cd9575f5
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
framework/core/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' : '')}> <div className={'DiscussionListItem-content Slidable-content' + (isUnread ? ' unread' : '') + (isRead ? ' read' : '')}>
<a href={user ? app.route.user(user) : '#'} <a href={user ? app.route.user(user) : '#'}
className="DiscussionListItem-author" 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) { config={function(element) {
$(element).tooltip({placement: 'right'}); $(element).tooltip({placement: 'right'});
m.route.apply(this, arguments); m.route.apply(this, arguments);

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

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

@@ -39,7 +39,7 @@ class DiscussionSerializer extends BasicDiscussionSerializer
$attributes = parent::getDefaultAttributes($discussion) + [ $attributes = parent::getDefaultAttributes($discussion) + [
'commentCount' => (int) $discussion->comment_count, 'commentCount' => (int) $discussion->comment_count,
'participantCount' => (int) $discussion->participant_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), 'lastTime' => $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),