From 8eb4a75da7240d66e4013b0f8ef83a54e30e541c Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 24 Aug 2018 21:27:05 +0930 Subject: [PATCH] Rename post.editTime --- framework/core/js/src/common/models/Post.js | 4 ++-- framework/core/js/src/forum/components/PostEdited.js | 2 +- framework/core/src/Api/Serializer/PostSerializer.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/core/js/src/common/models/Post.js b/framework/core/js/src/common/models/Post.js index 0c72d3710..a720ed3a9 100644 --- a/framework/core/js/src/common/models/Post.js +++ b/framework/core/js/src/common/models/Post.js @@ -15,9 +15,9 @@ Object.assign(Post.prototype, { contentHtml: Model.attribute('contentHtml'), contentPlain: computed('contentHtml', getPlainContent), - editTime: Model.attribute('editTime', Model.transformDate), + editedAt: Model.attribute('editedAt', Model.transformDate), editUser: Model.hasOne('editUser'), - isEdited: computed('editTime', editTime => !!editTime), + isEdited: computed('editedAt', editedAt => !!editedAt), hideTime: Model.attribute('hideTime', Model.transformDate), hideUser: Model.hasOne('hideUser'), diff --git a/framework/core/js/src/forum/components/PostEdited.js b/framework/core/js/src/forum/components/PostEdited.js index e35ced036..3b8bc6f90 100644 --- a/framework/core/js/src/forum/components/PostEdited.js +++ b/framework/core/js/src/forum/components/PostEdited.js @@ -21,7 +21,7 @@ export default class PostEdited extends Component { const editUser = post.editUser(); const editedInfo = extractText(app.translator.trans( 'core.forum.post.edited_tooltip', - {user: editUser, ago: humanTime(post.editTime())} + {user: editUser, ago: humanTime(post.editedAt())} )); if (editedInfo !== this.oldEditedInfo) { this.shouldUpdateTooltip = true; diff --git a/framework/core/src/Api/Serializer/PostSerializer.php b/framework/core/src/Api/Serializer/PostSerializer.php index b3e4495e1..31305963f 100644 --- a/framework/core/src/Api/Serializer/PostSerializer.php +++ b/framework/core/src/Api/Serializer/PostSerializer.php @@ -56,7 +56,7 @@ class PostSerializer extends BasicPostSerializer } if ($post->edited_at) { - $attributes['editTime'] = $this->formatDate($post->edited_at); + $attributes['editedAt'] = $this->formatDate($post->edited_at); } if ($post->hidden_at) {