mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 15:37:51 +02:00
Code Issues Releases Wiki Activity

Rename discussion.startUser

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 20:43:52 +09:30
parent e241518506
commit 8ecb67d49d
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ Object.assign(Discussion.prototype, {
slug: Model.attribute('slug'),
startTime: Model.attribute('startTime', Model.transformDate),
startUser: Model.hasOne('startUser'),
user: Model.hasOne('user'),
firstPost: Model.hasOne('firstPost'),
lastTime: Model.attribute('lastTime', Model.transformDate),

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

@@ -87,7 +87,7 @@ export default class DiscussionList extends Component {
* @api
*/
requestParams() {
const params = {include: ['startUser', 'lastUser'], filter: {}};
const params = {include: ['user', 'lastUser'], filter: {}};
params.sort = this.sortMap()[this.props.params.sort];

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

@@ -58,7 +58,7 @@ export default class DiscussionListItem extends Component {
if (retain) return retain;
const discussion = this.props.discussion;
const startUser = discussion.startUser();
const user = discussion.user();
const isUnread = discussion.isUnread();
const isRead = discussion.isRead();
const showUnread = !this.showRepliesCount() && isUnread;
@@ -93,14 +93,14 @@ export default class DiscussionListItem extends Component {
</a>
<div className={'DiscussionListItem-content Slidable-content' + (isUnread ? ' unread' : '') + (isRead ? ' read' : '')}>
<a href={startUser ? app.route.user(startUser) : '#'}
<a href={user ? app.route.user(user) : '#'}
className="DiscussionListItem-author"
title={extractText(app.translator.trans('core.forum.discussion_list.started_text', {user: startUser, ago: humanTime(discussion.startTime())}))}
title={extractText(app.translator.trans('core.forum.discussion_list.started_text', {user: user, ago: humanTime(discussion.startTime())}))}
config={function(element) {
$(element).tooltip({placement: 'right'});
m.route.apply(this, arguments);
}}>
{avatar(startUser, {title: ''})}
{avatar(user, {title: ''})}
</a>
<ul className="DiscussionListItem-badges badges">

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

@@ -15,7 +15,7 @@ export default class TerminalPost extends Component {
const discussion = this.props.discussion;
const lastPost = this.props.lastPost && discussion.repliesCount();
const user = discussion[lastPost ? 'lastUser' : 'startUser']();
const user = discussion[lastPost ? 'lastUser' : 'user']();
const time = discussion[lastPost ? 'lastTime' : 'startTime']();
return (