From 29cef234049afc5b50c7c900a42a6bbf01e79094 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 24 Aug 2018 20:55:40 +0930 Subject: [PATCH] Rename discussion.hideUser --- js/src/common/models/Discussion.js | 2 +- js/src/forum/utils/DiscussionControls.js | 4 ++-- src/Api/Serializer/BasicDiscussionSerializer.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/common/models/Discussion.js b/js/src/common/models/Discussion.js index 6b8f4a8f2..57086c6a5 100644 --- a/js/src/common/models/Discussion.js +++ b/js/src/common/models/Discussion.js @@ -29,7 +29,7 @@ Object.assign(Discussion.prototype, { isRead: computed('unreadCount', unreadCount => app.session.user && !unreadCount), hiddenAt: Model.attribute('hiddenAt', Model.transformDate), - hideUser: Model.hasOne('hideUser'), + hiddenUser: Model.hasOne('hiddenUser'), isHidden: computed('hiddenAt', hiddenAt => !!hiddenAt), canReply: Model.attribute('canReply'), diff --git a/js/src/forum/utils/DiscussionControls.js b/js/src/forum/utils/DiscussionControls.js index f90f324df..75f21a7e8 100644 --- a/js/src/forum/utils/DiscussionControls.js +++ b/js/src/forum/utils/DiscussionControls.js @@ -183,7 +183,7 @@ export default { * @return {Promise} */ hideAction() { - this.pushAttributes({ hiddenAt: new Date(), hideUser: app.session.user }); + this.pushAttributes({ hiddenAt: new Date(), hiddenUser: app.session.user }); return this.save({ isHidden: true }); }, @@ -194,7 +194,7 @@ export default { * @return {Promise} */ restoreAction() { - this.pushAttributes({ hiddenAt: null, hideUser: null }); + this.pushAttributes({ hiddenAt: null, hiddenUser: null }); return this.save({ isHidden: false }); }, diff --git a/src/Api/Serializer/BasicDiscussionSerializer.php b/src/Api/Serializer/BasicDiscussionSerializer.php index 8adc2ae67..2157fd3f7 100644 --- a/src/Api/Serializer/BasicDiscussionSerializer.php +++ b/src/Api/Serializer/BasicDiscussionSerializer.php @@ -92,7 +92,7 @@ class BasicDiscussionSerializer extends AbstractSerializer /** * @return \Tobscure\JsonApi\Relationship */ - protected function hideUser($discussion) + protected function hiddenUser($discussion) { return $this->hasOne($discussion, BasicUserSerializer::class); }