ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved tag autocompleting to API

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-04 09:20:13 +02:00
parent 1787604ac1
commit 26323f996b
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public_html/dispatch.php
View file

@ -125,10 +125,10 @@ $tagValidation =
\Chibi\Router::register(['TagController', 'listView'], 'GET', '/tags', $tagValidation); \Chibi\Router::register(['TagController', 'listView'], 'GET', '/tags', $tagValidation);
\Chibi\Router::register(['TagController', 'listView'], 'GET', '/tags/{page}', $tagValidation); \Chibi\Router::register(['TagController', 'listView'], 'GET', '/tags/{page}', $tagValidation);
\Chibi\Router::register(['TagController', 'listView'], 'GET', '/tags/{filter}/{page}', $tagValidation); \Chibi\Router::register(['TagController', 'listView'], 'GET', '/tags/{filter}/{page}', $tagValidation);
\Chibi\Router::register(['TagController', 'autoCompleteView'], 'GET', '/tags-autocomplete', $tagValidation);
foreach (['GET', 'POST'] as $method) foreach (['GET', 'POST'] as $method)
{ {
\Chibi\Router::register(['TagController', 'autoCompleteAction'], $method, '/tags-autocomplete', $tagValidation);
\Chibi\Router::register(['TagController', 'relatedAction'], $method, '/tags-related', $tagValidation); \Chibi\Router::register(['TagController', 'relatedAction'], $method, '/tags-related', $tagValidation);
\Chibi\Router::register(['TagController', 'mergeAction'], $method, '/tags-merge', $tagValidation); \Chibi\Router::register(['TagController', 'mergeAction'], $method, '/tags-merge', $tagValidation);
\Chibi\Router::register(['TagController', 'renameAction'], $method, '/tags-rename', $tagValidation); \Chibi\Router::register(['TagController', 'renameAction'], $method, '/tags-rename', $tagValidation);

21
src/Controllers/TagController.php
View file

@ -18,16 +18,19 @@ class TagController
$context->transport->paginator = $ret; $context->transport->paginator = $ret;
} }
public function autoCompleteAction() public function autoCompleteView()
{ {
$filter = InputHelper::get('search');
$filter .= ' order:popularity,desc';
$ret = Api::run(
(new ListTagsJob)->setPageSize(15),
[
ListTagsJob::QUERY => $filter,
ListTagsJob::PAGE_NUMBER => 1,
]);
$context = getContext(); $context = getContext();
Access::assert(Privilege::ListTags);
$suppliedSearch = InputHelper::get('search');
$filter = $suppliedSearch . ' order:popularity,desc';
$tags = TagSearchService::getEntitiesRows($filter, 15, 1);
$context->transport->tags = $context->transport->tags =
array_values(array_map( array_values(array_map(
function($tag) function($tag)
@ -36,7 +39,7 @@ class TagController
'name' => $tag['name'], 'name' => $tag['name'],
'count' => $tag['post_count'] 'count' => $tag['post_count']
]; ];
}, $tags)); }, $ret->entities));
} }
public function relatedAction() public function relatedAction()