mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-12 20:36:28 +02:00
Code Issues Releases Wiki Activity

Rename post.hideTime

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 21:27:50 +09:30
parent 07c08ca798
commit dd65801d57
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/common/models/Post.js
View File

@ -19,9 +19,9 @@ Object.assign(Post.prototype, {
editUser: Model.hasOne('editUser'), editUser: Model.hasOne('editUser'),
isEdited: computed('editedAt', editedAt => !!editedAt), isEdited: computed('editedAt', editedAt => !!editedAt),
hideTime: Model.attribute('hideTime', Model.transformDate), hiddenAt: Model.attribute('hiddenAt', Model.transformDate),
hideUser: Model.hasOne('hideUser'), hideUser: Model.hasOne('hideUser'),
isHidden: computed('hideTime', hideTime => !!hideTime), isHidden: computed('hiddenAt', hiddenAt => !!hiddenAt),
canEdit: Model.attribute('canEdit'), canEdit: Model.attribute('canEdit'),
canHide: Model.attribute('canHide'), canHide: Model.attribute('canHide'),

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

@ -123,7 +123,7 @@ export default {
* @return {Promise} * @return {Promise}
*/ */
hideAction() { hideAction() {
this.pushAttributes({ hideTime: new Date(), hideUser: app.session.user }); this.pushAttributes({ hiddenAt: new Date(), hideUser: 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({ hideTime: null, hideUser: null }); this.pushAttributes({ hiddenAt: null, hideUser: null });
return this.save({ isHidden: false }).then(() => m.redraw()); return this.save({ isHidden: false }).then(() => m.redraw());
}, },

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

@ -61,7 +61,7 @@ class PostSerializer extends BasicPostSerializer
if ($post->hidden_at) { if ($post->hidden_at) {
$attributes['isHidden'] = true; $attributes['isHidden'] = true;
$attributes['hideTime'] = $this->formatDate($post->hidden_at); $attributes['hiddenAt'] = $this->formatDate($post->hidden_at);
} }
$attributes += [ $attributes += [