github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-08 20:42:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix discussion and post list sorting

Browse Source
This commit is contained in:
Toby Zerner 2018-07-21 17:10:02 +09:30
parent 2d667d885d
commit 6f3eb3f335
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/forum/components/DiscussionList.js
View File

@ -112,10 +112,10 @@ export default class DiscussionList extends Component {
if (this.props.params.q) { if (this.props.params.q) {
map.relevance = ''; map.relevance = '';
} }
map.latest = '-lastTime'; map.latest = '-lastPostedAt';
map.top = '-commentsCount'; map.top = '-commentCount';
map.newest = '-startTime'; map.newest = '-createdAt';
map.oldest = 'startTime'; map.oldest = 'createdAt';
return map; return map;
} }

2
js/src/forum/components/PostsUserPage.js
View File

@ -114,7 +114,7 @@ export default class PostsUserPage extends UserPage {
type: 'comment' type: 'comment'
}, },
page: {offset, limit: this.loadLimit}, page: {offset, limit: this.loadLimit},
sort: '-time' sort: '-createdAt'
}); });
} }

4
src/Api/Controller/ListPostsController.php
View File

@ -40,7 +40,7 @@ class ListPostsController extends AbstractListController
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public $sortFields = ['time']; public $sortFields = ['createdAt'];
/** /**
* @var \Flarum\Post\PostRepository * @var \Flarum\Post\PostRepository
@ -120,7 +120,7 @@ class ListPostsController extends AbstractListController
$query->skip($offset)->take($limit); $query->skip($offset)->take($limit);
foreach ((array) $sort as $field => $order) { foreach ((array) $sort as $field => $order) {
$query->orderBy($field, $order); $query->orderBy(snake_case($field), $order);
} }
return $query->pluck('id')->all(); return $query->pluck('id')->all();

8
src/Forum/Controller/IndexController.php
View File

@ -30,10 +30,10 @@ class IndexController extends FrontendController
* @var array * @var array
*/ */
private $sortMap = [ private $sortMap = [
'latest' => '-lastTime', 'latest' => '-lastPostedAt',
'top' => '-commentsCount', 'top' => '-commentCount',
'newest' => '-startTime', 'newest' => '-createdAt',
'oldest' => 'startTime' 'oldest' => 'createdAt'
]; ];
/** /**