diff --git a/framework/core/js/src/common/models/Discussion.js b/framework/core/js/src/common/models/Discussion.js index 54ce6f1ed..7310c0ebf 100644 --- a/framework/core/js/src/common/models/Discussion.js +++ b/framework/core/js/src/common/models/Discussion.js @@ -28,9 +28,9 @@ Object.assign(Discussion.prototype, { isUnread: computed('unreadCount', unreadCount => !!unreadCount), isRead: computed('unreadCount', unreadCount => app.session.user && !unreadCount), - hideTime: Model.attribute('hideTime', Model.transformDate), + hiddenAt: Model.attribute('hiddenAt', Model.transformDate), hideUser: Model.hasOne('hideUser'), - isHidden: computed('hideTime', hideTime => !!hideTime), + isHidden: computed('hiddenAt', hiddenAt => !!hiddenAt), canReply: Model.attribute('canReply'), canRename: Model.attribute('canRename'), diff --git a/framework/core/js/src/forum/utils/DiscussionControls.js b/framework/core/js/src/forum/utils/DiscussionControls.js index 93bfef3c4..f90f324df 100644 --- a/framework/core/js/src/forum/utils/DiscussionControls.js +++ b/framework/core/js/src/forum/utils/DiscussionControls.js @@ -183,7 +183,7 @@ export default { * @return {Promise} */ hideAction() { - this.pushAttributes({ hideTime: new Date(), hideUser: app.session.user }); + this.pushAttributes({ hiddenAt: new Date(), hideUser: app.session.user }); return this.save({ isHidden: true }); }, @@ -194,7 +194,7 @@ export default { * @return {Promise} */ restoreAction() { - this.pushAttributes({ hideTime: null, hideUser: null }); + this.pushAttributes({ hiddenAt: null, hideUser: null }); return this.save({ isHidden: false }); }, diff --git a/framework/core/src/Api/Serializer/DiscussionSerializer.php b/framework/core/src/Api/Serializer/DiscussionSerializer.php index 3a2395eee..e741d4682 100644 --- a/framework/core/src/Api/Serializer/DiscussionSerializer.php +++ b/framework/core/src/Api/Serializer/DiscussionSerializer.php @@ -50,7 +50,7 @@ class DiscussionSerializer extends BasicDiscussionSerializer if ($discussion->hidden_at) { $attributes['isHidden'] = true; - $attributes['hideTime'] = $this->formatDate($discussion->hidden_at); + $attributes['hiddenAt'] = $this->formatDate($discussion->hidden_at); } Discussion::setStateUser($this->actor);