github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-21 18:01:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename user.discussionsCount

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 21:32:47 +09:30
parent ca93c8c609
commit 64abbde8b2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ Object.assign(User.prototype, {
unreadNotificationsCount: Model.attribute('unreadNotificationsCount'), unreadNotificationsCount: Model.attribute('unreadNotificationsCount'),
newNotificationsCount: Model.attribute('newNotificationsCount'), newNotificationsCount: Model.attribute('newNotificationsCount'),
discussionsCount: Model.attribute('discussionsCount'), discussionCount: Model.attribute('discussionCount'),
commentsCount: Model.attribute('commentsCount'), commentsCount: Model.attribute('commentsCount'),
canEdit: Model.attribute('canEdit'), canEdit: Model.attribute('canEdit'),

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

@ -140,7 +140,7 @@ export default class UserPage extends Page {
items.add('discussions', items.add('discussions',
LinkButton.component({ LinkButton.component({
href: app.route('user.discussions', {username: user.username()}), href: app.route('user.discussions', {username: user.username()}),
children: [app.translator.trans('core.forum.user.discussions_link'), <span className="Button-badge">{user.discussionsCount()}</span>], children: [app.translator.trans('core.forum.user.discussions_link'), <span className="Button-badge">{user.discussionCount()}</span>],
icon: 'fas fa-bars' icon: 'fas fa-bars'
}), }),
90 90

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

@ -42,7 +42,7 @@ class UserSerializer extends BasicUserSerializer
$attributes += [ $attributes += [
'joinTime' => $this->formatDate($user->joined_at), 'joinTime' => $this->formatDate($user->joined_at),
'discussionsCount' => (int) $user->discussion_count, 'discussionCount' => (int) $user->discussion_count,
'commentsCount' => (int) $user->comment_count, 'commentsCount' => (int) $user->comment_count,
'canEdit' => $canEdit, 'canEdit' => $canEdit,
'canDelete' => $gate->allows('delete', $user), 'canDelete' => $gate->allows('delete', $user),