mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-17 14:51:19 +02:00
Code Issues Releases Wiki Activity

Rename discussion.repliesCount

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 20:56:25 +09:30
parent 1f076acbe2
commit e1400b0ef9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ Object.assign(Discussion.prototype, {
lastPostNumber: Model.attribute('lastPostNumber'), lastPostNumber: Model.attribute('lastPostNumber'),
commentCount: Model.attribute('commentCount'), commentCount: Model.attribute('commentCount'),
repliesCount: computed('commentCount', commentCount => Math.max(0, commentCount - 1)), replyCount: computed('commentCount', commentCount => Math.max(0, commentCount - 1)),
posts: Model.hasMany('posts'), posts: Model.hasMany('posts'),
mostRelevantPost: Model.hasOne('mostRelevantPost'), mostRelevantPost: Model.hasOne('mostRelevantPost'),

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

@@ -117,7 +117,7 @@ export default class DiscussionListItem extends Component {
<span className="DiscussionListItem-count" <span className="DiscussionListItem-count"
onclick={this.markAsRead.bind(this)} onclick={this.markAsRead.bind(this)}
title={showUnread ? app.translator.trans('core.forum.discussion_list.mark_as_read_tooltip') : ''}> title={showUnread ? app.translator.trans('core.forum.discussion_list.mark_as_read_tooltip') : ''}>
{abbreviateNumber(discussion[showUnread ? 'unreadCount' : 'repliesCount']())} {abbreviateNumber(discussion[showUnread ? 'unreadCount' : 'replyCount']())}
</span> </span>
</div> </div>
</div> </div>

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

@@ -13,7 +13,7 @@ import icon from '../../common/helpers/icon';
export default class TerminalPost extends Component { export default class TerminalPost extends Component {
view() { view() {
const discussion = this.props.discussion; const discussion = this.props.discussion;
const lastPost = this.props.lastPost && discussion.repliesCount(); const lastPost = this.props.lastPost && discussion.replyCount();
const user = discussion[lastPost ? 'lastPostedUser' : 'user'](); const user = discussion[lastPost ? 'lastPostedUser' : 'user']();
const time = discussion[lastPost ? 'lastPostedAt' : 'createdAt'](); const time = discussion[lastPost ? 'lastPostedAt' : 'createdAt']();