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

Moved tag merging to API

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-04 10:03:21 +02:00
parent 5d2c5a2053
commit d2319465c1
4 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public_html/dispatch.php
View file

@ -129,10 +129,11 @@ $tagValidation =
\Chibi\Router::register(['TagController', 'relatedView'], 'GET', '/tags-related', $tagValidation);
\Chibi\Router::register(['TagController', 'renameView'], 'GET', '/tags-rename', $tagValidation);
\Chibi\Router::register(['TagController', 'renameAction'], 'POST', '/tags-rename', $tagValidation);
\Chibi\Router::register(['TagController', 'mergeView'], 'GET', '/tags-merge', $tagValidation);
\Chibi\Router::register(['TagController', 'mergeAction'], 'POST', '/tags-merge', $tagValidation);
foreach (['GET', 'POST'] as $method)
{
\Chibi\Router::register(['TagController', 'mergeAction'], $method, '/tags-merge', $tagValidation);
\Chibi\Router::register(['TagController', 'massTagRedirectAction'], $method, '/mass-tag-redirect', $tagValidation);
$userValidations =

35
src/Api/Jobs/MergeTagsJob.php Normal file
View file

@ -0,0 +1,35 @@
<?php
class MergeTagsJob extends AbstractJob
{
const SOURCE_TAG_NAME = 'source-tag-name';
const TARGET_TAG_NAME = 'target-tag-name';
public function execute()
{
$sourceTag = $this->getArgument(self::SOURCE_TAG_NAME);
$targetTag = $this->getArgument(self::TARGET_TAG_NAME);
TagModel::removeUnused();
TagModel::merge($sourceTag, $targetTag);
LogHelper::log('{user} merged {source} with {target}', [
'user' => TextHelper::reprUser(Auth::getCurrentUser()),
'source' => TextHelper::reprTag($sourceTag),
'target' => TextHelper::reprTag($targetTag)]);
}
public function requiresPrivilege()
{
return Privilege::MergeTags;
}
public function requiresAuthentication()
{
return false;
}
public function requiresConfirmedEmail()
{
return false;
}
}

27
src/Controllers/TagController.php
View file

@ -67,6 +67,12 @@ class TagController
}, $ret->entities));
}
public function mergeView()
{
$context = getContext();
$context->viewName = 'tag-list-wrapper';
}
public function mergeAction()
{
$context = getContext();
@ -74,22 +80,13 @@ class TagController
$context->handleExceptions = true;
Access::assert(Privilege::MergeTags);
if (!InputHelper::get('submit'))
return;
TagModel::removeUnused();
$suppliedSourceTag = InputHelper::get('source-tag');
$suppliedSourceTag = TagModel::validateTag($suppliedSourceTag);
$suppliedTargetTag = InputHelper::get('target-tag');
$suppliedTargetTag = TagModel::validateTag($suppliedTargetTag);
TagModel::merge($suppliedSourceTag, $suppliedTargetTag);
LogHelper::log('{user} merged {source} with {target}', [
'source' => TextHelper::reprTag($suppliedSourceTag),
'target' => TextHelper::reprTag($suppliedTargetTag)]);
Api::run(
new MergeTagsJob(),
[
MergeTagsJob::SOURCE_TAG_NAME => InputHelper::get('source-tag'),
MergeTagsJob::TARGET_TAG_NAME => InputHelper::get('target-tag'),
]);
Messenger::message('Tags merged successfully.');
}

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

@ -4,8 +4,8 @@ Assets::addStylesheet('tag-list.css');
$tabs = [];
if (Access::check(Privilege::ListTags)) $tabs['list'] = ['List', 'listView'];
if (Access::check(Privilege::MergeTags)) $tabs['merge'] = ['Merge', 'mergeAction'];
if (Access::check(Privilege::RenameTags)) $tabs['rename'] = ['Rename', 'renameView'];
if (Access::check(Privilege::MergeTags)) $tabs['merge'] = ['Merge', 'mergeView'];
if (Access::check(Privilege::MassTag)) $tabs['mass-tag-redirect'] = ['Mass tag', 'massTagRedirectAction'];
$showTabs = count($tabs) > 1;
?>