github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 23:23:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Rename discussion.hideTime

Browse Source
This commit is contained in:
Toby Zerner 2018-08-24 20:50:00 +09:30
parent 2ba550afa7
commit dc4e650091
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'),

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

@ -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 });
},

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

@ -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);