From c2f6e2d7a37e11d048b495e8ca5cba523c4a9c89 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 24 Aug 2018 21:25:45 +0930 Subject: [PATCH] Rename post.time --- framework/core/js/src/common/models/Post.js | 2 +- framework/core/js/src/forum/components/PostMeta.js | 2 +- framework/core/js/src/forum/components/PostStream.js | 2 +- framework/core/src/Api/Serializer/BasicPostSerializer.php | 2 +- framework/core/src/Post/Command/PostReplyHandler.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/core/js/src/common/models/Post.js b/framework/core/js/src/common/models/Post.js index 848434dab..0c72d3710 100644 --- a/framework/core/js/src/common/models/Post.js +++ b/framework/core/js/src/common/models/Post.js @@ -8,7 +8,7 @@ Object.assign(Post.prototype, { number: Model.attribute('number'), discussion: Model.hasOne('discussion'), - time: Model.attribute('time', Model.transformDate), + createdAt: Model.attribute('createdAt', Model.transformDate), user: Model.hasOne('user'), contentType: Model.attribute('contentType'), content: Model.attribute('content'), diff --git a/framework/core/js/src/forum/components/PostMeta.js b/framework/core/js/src/forum/components/PostMeta.js index 965819d93..98df112aa 100644 --- a/framework/core/js/src/forum/components/PostMeta.js +++ b/framework/core/js/src/forum/components/PostMeta.js @@ -14,7 +14,7 @@ import fullTime from '../../common/helpers/fullTime'; export default class PostMeta extends Component { view() { const post = this.props.post; - const time = post.time(); + const time = post.createdAt(); const permalink = this.getPermalink(post); const touch = 'ontouchstart' in document.documentElement; diff --git a/framework/core/js/src/forum/components/PostStream.js b/framework/core/js/src/forum/components/PostStream.js index 6175e20dd..335d0f441 100644 --- a/framework/core/js/src/forum/components/PostStream.js +++ b/framework/core/js/src/forum/components/PostStream.js @@ -205,7 +205,7 @@ class PostStream extends Component { const attrs = {'data-index': this.visibleStart + i}; if (post) { - const time = post.time(); + const time = post.createdAt(); const PostComponent = app.postComponents[post.contentType()]; content = PostComponent ? PostComponent.component({post}) : ''; diff --git a/framework/core/src/Api/Serializer/BasicPostSerializer.php b/framework/core/src/Api/Serializer/BasicPostSerializer.php index fcd689136..b12c28175 100644 --- a/framework/core/src/Api/Serializer/BasicPostSerializer.php +++ b/framework/core/src/Api/Serializer/BasicPostSerializer.php @@ -39,7 +39,7 @@ class BasicPostSerializer extends AbstractSerializer $attributes = [ 'id' => (int) $post->id, 'number' => (int) $post->number, - 'time' => $this->formatDate($post->created_at), + 'createdAt' => $this->formatDate($post->created_at), 'contentType' => $post->type ]; diff --git a/framework/core/src/Post/Command/PostReplyHandler.php b/framework/core/src/Post/Command/PostReplyHandler.php index 816448da5..5817bbfcf 100644 --- a/framework/core/src/Post/Command/PostReplyHandler.php +++ b/framework/core/src/Post/Command/PostReplyHandler.php @@ -91,7 +91,7 @@ class PostReplyHandler $command->ipAddress ); - if ($actor->isAdmin() && ($time = array_get($command->data, 'attributes.time'))) { + if ($actor->isAdmin() && ($time = array_get($command->data, 'attributes.createdAt'))) { $post->created_at = new Carbon($time); }