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

Fixed mass tag

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-19 01:04:22 +02:00
parent 837c04c400
commit acbd45d530
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controllers/TagController.php
View file

@ -142,12 +142,14 @@ class TagController extends AbstractController
$params = $params =
[ [
'source' => 'mass-tag', 'source' => 'mass-tag',
'query' => $suppliedQuery ?: '', 'query' => trim($suppliedQuery ?: ''),
'additionalInfo' => $suppliedTag ? $suppliedTag : '', 'additionalInfo' => $suppliedTag ? $suppliedTag : '',
]; ];
if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery) if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery)
$params['page'] = $suppliedOldPage; $params['page'] = $suppliedOldPage;
else
$params['page'] = 1;
$url = \Chibi\Router::linkTo(['PostController', 'listView'], $params); $url = \Chibi\Router::linkTo(['PostController', 'listView'], $params);
$this->redirect($url); $this->redirect($url);

2
src/Views/tag/tag-list-wrapper.phtml
View file

@ -13,7 +13,7 @@ if (Access::check(new Privilege(Privilege::MergeTags)))
$tabs['merge'] = ['Merge', 'mergeView']; $tabs['merge'] = ['Merge', 'mergeView'];
if (Access::check(new Privilege(Privilege::MassTag))) if (Access::check(new Privilege(Privilege::MassTag)))
$tabs['mass-tag'] = ['Mass tag', 'massTagRedirectAction']; $tabs['mass-tag'] = ['Mass tag', 'massTagRedirectView'];
$showTabs = count($tabs) > 1; $showTabs = count($tabs) > 1;
?> ?>

2
src/routes.php
View file

@ -40,7 +40,7 @@ $postValidation =
\Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{page}', $postValidation); \Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{page}', $postValidation);
\Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{query}/{page}', $postValidation); \Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{query}/{page}', $postValidation);
\Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{query}/{additionalInfo}/{page}', $postValidation); \Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{query}/{additionalInfo}/{page}', $postValidation);
\Chibi\Router::register(['PostController', 'listRedirectAction'], 'POST', '/{source}-redirect', $postValidation); \Chibi\Router::register(['PostController', 'listRedirectAction'], 'POST', '/posts-redirect', $postValidation);
\Chibi\Router::register(['PostController', 'randomView'], 'GET', '/random', $postValidation); \Chibi\Router::register(['PostController', 'randomView'], 'GET', '/random', $postValidation);
\Chibi\Router::register(['PostController', 'randomView'], 'GET', '/random/{page}', $postValidation); \Chibi\Router::register(['PostController', 'randomView'], 'GET', '/random/{page}', $postValidation);