mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

Rename post.editUser

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 21:29:17 +09:30
parent 767becec00
commit 5bb93e569b
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/src/common/models/Post.js
View File

@@ -16,7 +16,7 @@ Object.assign(Post.prototype, {
contentPlain: computed('contentHtml', getPlainContent), contentPlain: computed('contentHtml', getPlainContent),
editedAt: Model.attribute('editedAt', Model.transformDate), editedAt: Model.attribute('editedAt', Model.transformDate),
editUser: Model.hasOne('editUser'), editedUser: Model.hasOne('editedUser'),
isEdited: computed('editedAt', editedAt => !!editedAt), isEdited: computed('editedAt', editedAt => !!editedAt),
hiddenAt: Model.attribute('hiddenAt', Model.transformDate), hiddenAt: Model.attribute('hiddenAt', Model.transformDate),

4
framework/core/js/src/forum/components/PostEdited.js
View File

@@ -18,10 +18,10 @@ export default class PostEdited extends Component {
view() { view() {
const post = this.props.post; const post = this.props.post;
const editUser = post.editUser(); const editedUser = post.editedUser();
const editedInfo = extractText(app.translator.trans( const editedInfo = extractText(app.translator.trans(
'core.forum.post.edited_tooltip', 'core.forum.post.edited_tooltip',
{user: editUser, ago: humanTime(post.editedAt())} {user: editedUser, ago: humanTime(post.editedAt())}
)); ));
if (editedInfo !== this.oldEditedInfo) { if (editedInfo !== this.oldEditedInfo) {
this.shouldUpdateTooltip = true; this.shouldUpdateTooltip = true;

2
framework/core/src/Api/Controller/ListPostsController.php
View File

@@ -32,7 +32,7 @@ class ListPostsController extends AbstractListController
public $include = [ public $include = [
'user', 'user',
'user.groups', 'user.groups',
'editUser', 'editedUser',
'hideUser', 'hideUser',
'discussion' 'discussion'
]; ];

2
framework/core/src/Api/Controller/ShowDiscussionController.php
View File

@@ -44,7 +44,7 @@ class ShowDiscussionController extends AbstractShowController
'posts.discussion', 'posts.discussion',
'posts.user', 'posts.user',
'posts.user.groups', 'posts.user.groups',
'posts.editUser', 'posts.editedUser',
'posts.hideUser' 'posts.hideUser'
]; ];

2
framework/core/src/Api/Controller/ShowPostController.php
View File

@@ -29,7 +29,7 @@ class ShowPostController extends AbstractShowController
public $include = [ public $include = [
'user', 'user',
'user.groups', 'user.groups',
'editUser', 'editedUser',
'hideUser', 'hideUser',
'discussion' 'discussion'
]; ];

2
framework/core/src/Api/Controller/UpdatePostController.php
View File

@@ -28,7 +28,7 @@ class UpdatePostController extends AbstractShowController
* {@inheritdoc} * {@inheritdoc}
*/ */
public $include = [ public $include = [
'editUser', 'editedUser',
'discussion' 'discussion'
]; ];

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

@@ -92,7 +92,7 @@ class PostSerializer extends BasicPostSerializer
/** /**
* @return \Tobscure\JsonApi\Relationship * @return \Tobscure\JsonApi\Relationship
*/ */
protected function editUser($post) protected function editedUser($post)
{ {
return $this->hasOne($post, BasicUserSerializer::class); return $this->hasOne($post, BasicUserSerializer::class);
} }

4
framework/core/src/Post/Post.php
View File

@@ -34,7 +34,7 @@ use Illuminate\Database\Eloquent\Builder;
* @property int|null $hidden_user_id * @property int|null $hidden_user_id
* @property \Flarum\Discussion\Discussion|null $discussion * @property \Flarum\Discussion\Discussion|null $discussion
* @property User|null $user * @property User|null $user
* @property User|null $editUser * @property User|null $editedUser
* @property User|null $hideUser * @property User|null $hideUser
* @property string $ip_address * @property string $ip_address
* @property bool $is_private * @property bool $is_private
@@ -167,7 +167,7 @@ class Post extends AbstractModel
* *
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/ */
public function editUser() public function editedUser()
{ {
return $this->belongsTo(User::class, 'edited_user_id'); return $this->belongsTo(User::class, 'edited_user_id');
} }