mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00
Code Issues Releases Wiki Activity

went over most of the changed attributes from the other pr

Browse Source
This commit is contained in:
Daniel Klabbers
2018-04-17 14:22:38 +02:00
parent efa3b62fb8
commit a2927b725f
21 changed files with 122 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controller/ListDiscussionsController.php
View File

@@ -47,7 +47,7 @@ class ListDiscussionsController extends AbstractListController
/**
* {@inheritdoc}
*/
public $sortFields = ['lastTime', 'commentsCount', 'startTime'];
public $sortFields = ['lastPostedAt', 'commentCount', 'createdAt'];
/**
* @var DiscussionSearcher

12
src/Api/Serializer/DiscussionSerializer.php
View File

@@ -37,10 +37,10 @@ class DiscussionSerializer extends BasicDiscussionSerializer
$gate = $this->gate->forUser($this->actor);
$attributes = parent::getDefaultAttributes($discussion) + [
'commentsCount' => (int) $discussion->comments_count,
'participantsCount' => (int) $discussion->participants_count,
'startTime' => $this->formatDate($discussion->start_time),
'lastTime' => $this->formatDate($discussion->last_time),
'commentsCount' => (int) $discussion->comment_count,
'participantsCount' => (int) $discussion->participant_count,
'startTime' => $this->formatDate($discussion->created_at),
'lastTime' => $this->formatDate($discussion->last_posted_at),
'lastPostNumber' => (int) $discussion->last_post_number,
'canReply' => $gate->allows('reply', $discussion),
'canRename' => $gate->allows('rename', $discussion),
@@ -48,9 +48,9 @@ class DiscussionSerializer extends BasicDiscussionSerializer
'canHide' => $gate->allows('hide', $discussion)
];
if ($discussion->hide_time) {
if ($discussion->hidden_at) {
$attributes['isHidden'] = true;
$attributes['hideTime'] = $this->formatDate($discussion->hide_time);
$attributes['hideTime'] = $this->formatDate($discussion->hidden_at);
}
Discussion::setStateUser($this->actor);