github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-11 21:43:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename post.hideUser

Browse Source
This commit is contained in:
Toby Zerner 2018-08-24 21:30:06 +09:30
parent 5bb93e569b
commit 1c4070a034
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ Object.assign(Post.prototype, {
isEdited: computed('editedAt', editedAt => !!editedAt), isEdited: computed('editedAt', editedAt => !!editedAt),
hiddenAt: Model.attribute('hiddenAt', Model.transformDate), hiddenAt: Model.attribute('hiddenAt', Model.transformDate),
hideUser: Model.hasOne('hideUser'), hiddenUser: Model.hasOne('hiddenUser'),
isHidden: computed('hiddenAt', hiddenAt => !!hiddenAt), isHidden: computed('hiddenAt', hiddenAt => !!hiddenAt),
canEdit: Model.attribute('canEdit'), canEdit: Model.attribute('canEdit'),

4
framework/core/js/src/forum/utils/PostControls.js
View File

@ -123,7 +123,7 @@ export default {
* @return {Promise} * @return {Promise}
*/ */
hideAction() { hideAction() {
this.pushAttributes({ hiddenAt: new Date(), hideUser: app.session.user }); this.pushAttributes({ hiddenAt: new Date(), hiddenUser: app.session.user });
return this.save({ isHidden: true }).then(() => m.redraw()); return this.save({ isHidden: true }).then(() => m.redraw());
}, },
@ -134,7 +134,7 @@ export default {
* @return {Promise} * @return {Promise}
*/ */
restoreAction() { restoreAction() {
this.pushAttributes({ hiddenAt: null, hideUser: null }); this.pushAttributes({ hiddenAt: null, hiddenUser: null });
return this.save({ isHidden: false }).then(() => m.redraw()); return this.save({ isHidden: false }).then(() => m.redraw());
}, },

2
framework/core/src/Api/Controller/ListPostsController.php
View File

@ -33,7 +33,7 @@ class ListPostsController extends AbstractListController
'user', 'user',
'user.groups', 'user.groups',
'editedUser', 'editedUser',
'hideUser', 'hiddenUser',
'discussion' 'discussion'
]; ];

2
framework/core/src/Api/Controller/ShowDiscussionController.php
View File

@ -45,7 +45,7 @@ class ShowDiscussionController extends AbstractShowController
'posts.user', 'posts.user',
'posts.user.groups', 'posts.user.groups',
'posts.editedUser', 'posts.editedUser',
'posts.hideUser' 'posts.hiddenUser'
]; ];
/** /**

2
framework/core/src/Api/Controller/ShowPostController.php
View File

@ -30,7 +30,7 @@ class ShowPostController extends AbstractShowController
'user', 'user',
'user.groups', 'user.groups',
'editedUser', 'editedUser',
'hideUser', 'hiddenUser',
'discussion' 'discussion'
]; ];

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

@ -100,7 +100,7 @@ class PostSerializer extends BasicPostSerializer
/** /**
* @return \Tobscure\JsonApi\Relationship * @return \Tobscure\JsonApi\Relationship
*/ */
protected function hideUser($post) protected function hiddenUser($post)
{ {
return $this->hasOne($post, BasicUserSerializer::class); return $this->hasOne($post, BasicUserSerializer::class);
} }

4
framework/core/src/Post/Post.php
View File

@ -35,7 +35,7 @@ use Illuminate\Database\Eloquent\Builder;
* @property \Flarum\Discussion\Discussion|null $discussion * @property \Flarum\Discussion\Discussion|null $discussion
* @property User|null $user * @property User|null $user
* @property User|null $editedUser * @property User|null $editedUser
* @property User|null $hideUser * @property User|null $hiddenUser
* @property string $ip_address * @property string $ip_address
* @property bool $is_private * @property bool $is_private
*/ */
@ -177,7 +177,7 @@ class Post extends AbstractModel
* *
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/ */
public function hideUser() public function hiddenUser()
{ {
return $this->belongsTo(User::class, 'hidden_user_id'); return $this->belongsTo(User::class, 'hidden_user_id');
} }