github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-06 02:23:36 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Always use default includes when preloading discussion list

Browse Source 
Making them explicit causes problems when extensions want to include
something by default (e.g. tags)
This commit is contained in:
Toby Zerner 2015-07-22 10:11:23 +09:30
parent da1252eb5e
commit 9a41526310
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/src/Api/Actions/Discussions/IndexAction.php
View File

@ -32,9 +32,9 @@ class IndexAction extends SerializeCollectionAction
'lastUser' => true, 'lastUser' => true,
'startPost' => false, 'startPost' => false,
'lastPost' => false, 'lastPost' => false,
'relevantPosts' => false, 'relevantPosts' => true,
'relevantPosts.discussion' => false, 'relevantPosts.discussion' => true,
'relevantPosts.user' => false 'relevantPosts.user' => true
]; ];
/** /**

7
framework/core/src/Forum/Actions/IndexAction.php
View File

@ -10,8 +10,8 @@ class IndexAction extends ClientAction
* @var array * @var array
*/ */
protected $sortMap = [ protected $sortMap = [
'recent' => '-lastTime', 'latest' => '-lastTime',
'replies' => '-commentsCount', 'top' => '-commentsCount',
'newest' => '-startTime', 'newest' => '-startTime',
'oldest' => '+startTime' 'oldest' => '+startTime'
]; ];
@ -30,8 +30,7 @@ class IndexAction extends ClientAction
$params = [ $params = [
'sort' => $sort ? $this->sortMap[$sort] : '', 'sort' => $sort ? $this->sortMap[$sort] : '',
'filter' => ['q' => $q], 'filter' => ['q' => $q]
'include' => $q ? 'startUser,lastUser,relevantPosts,relevantPosts.discussion,relevantPosts.user' : ''
]; ];
// FIXME: make sure this is extensible. Support pagination. // FIXME: make sure this is extensible. Support pagination.