github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-22 03:58:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename discussion.hideUser

Browse Source
This commit is contained in:
Toby Zerner 2018-08-24 20:55:40 +09:30
parent 0049e0d608
commit 1f076acbe2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ Object.assign(Discussion.prototype, {
isRead: computed('unreadCount', unreadCount => app.session.user && !unreadCount), isRead: computed('unreadCount', unreadCount => app.session.user && !unreadCount),
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),
canReply: Model.attribute('canReply'), canReply: Model.attribute('canReply'),

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

@ -183,7 +183,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 }); return this.save({ isHidden: true });
}, },
@ -194,7 +194,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 }); return this.save({ isHidden: false });
}, },

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

@ -92,7 +92,7 @@ class BasicDiscussionSerializer extends AbstractSerializer
/** /**
* @return \Tobscure\JsonApi\Relationship * @return \Tobscure\JsonApi\Relationship
*/ */
protected function hideUser($discussion) protected function hiddenUser($discussion)
{ {
return $this->hasOne($discussion, BasicUserSerializer::class); return $this->hasOne($discussion, BasicUserSerializer::class);
} }