- |
+ |
<%= tag.name %>
|
diff --git a/public_html/templates/tag.tpl b/public_html/templates/tag.tpl
index 97b3cbb4..4d9e6e54 100644
--- a/public_html/templates/tag.tpl
+++ b/public_html/templates/tag.tpl
@@ -8,7 +8,7 @@
<% } %>
@@ -37,6 +37,21 @@
+ <% if (privileges.canChangeCategory) { %>
+
+ <% } %>
+
diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php
index 606b726f..049d7fc0 100644
--- a/src/Controllers/TagController.php
+++ b/src/Controllers/TagController.php
@@ -81,6 +81,9 @@ final class TagController extends AbstractController
if ($formData->name !== null)
$this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_NAME);
+ if ($formData->category !== null)
+ $this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_CATEGORY);
+
if ($formData->banned !== null)
$this->privilegeService->assertPrivilege(Privilege::BAN_TAGS);
diff --git a/src/Controllers/ViewProxies/TagViewProxy.php b/src/Controllers/ViewProxies/TagViewProxy.php
index 8d531d9e..bcc39c31 100644
--- a/src/Controllers/ViewProxies/TagViewProxy.php
+++ b/src/Controllers/ViewProxies/TagViewProxy.php
@@ -14,6 +14,7 @@ class TagViewProxy extends AbstractViewProxy
$result->name = $tag->getName();
$result->usages = $tag->getUsages();
$result->banned = $tag->isBanned();
+ $result->category = !empty($tag->getCategory()) ? $tag->getCategory() : 'default';
if (!empty($config[self::FETCH_IMPLICATIONS]))
$result->implications = $this->fromArray($tag->getImpliedTags());
diff --git a/src/Dao/EntityConverters/TagEntityConverter.php b/src/Dao/EntityConverters/TagEntityConverter.php
index d80cba99..28cabf85 100644
--- a/src/Dao/EntityConverters/TagEntityConverter.php
+++ b/src/Dao/EntityConverters/TagEntityConverter.php
@@ -13,6 +13,7 @@ class TagEntityConverter extends AbstractEntityConverter implements IEntityConve
'name' => $entity->getName(),
'creationTime' => $this->entityTimeToDbTime($entity->getCreationTime()),
'banned' => $entity->isBanned(),
+ 'category' => $entity->getCategory(),
];
}
@@ -23,6 +24,7 @@ class TagEntityConverter extends AbstractEntityConverter implements IEntityConve
$entity->setCreationTime($this->dbTimeToEntityTime($array['creationTime']));
$entity->setMeta(Tag::META_USAGES, intval($array['usages']));
$entity->setBanned($array['banned']);
+ $entity->setCategory($array['category']);
return $entity;
}
}
diff --git a/src/Entities/Tag.php b/src/Entities/Tag.php
index 80a7b7d4..d6943776 100644
--- a/src/Entities/Tag.php
+++ b/src/Entities/Tag.php
@@ -6,6 +6,7 @@ final class Tag extends Entity
private $name;
private $creationTime;
private $banned = false;
+ private $category;
const LAZY_LOADER_IMPLIED_TAGS = 'implications';
const LAZY_LOADER_SUGGESTED_TAGS = 'suggestions';
@@ -27,6 +28,11 @@ final class Tag extends Entity
return $this->creationTime;
}
+ public function setCreationTime($creationTime)
+ {
+ $this->creationTime = $creationTime;
+ }
+
public function isBanned()
{
return $this->banned;
@@ -37,9 +43,14 @@ final class Tag extends Entity
$this->banned = boolval($banned);
}
- public function setCreationTime($creationTime)
+ public function getCategory()
{
- $this->creationTime = $creationTime;
+ return $this->category;
+ }
+
+ public function setCategory($category)
+ {
+ $this->category = $category;
}
public function getUsages()
diff --git a/src/FormData/TagEditFormData.php b/src/FormData/TagEditFormData.php
index f55f931c..3ae43caf 100644
--- a/src/FormData/TagEditFormData.php
+++ b/src/FormData/TagEditFormData.php
@@ -7,6 +7,7 @@ class TagEditFormData implements IValidatable
{
public $name;
public $banned;
+ public $category;
public $implications;
public $suggestions;
@@ -14,7 +15,8 @@ class TagEditFormData implements IValidatable
{
if ($inputReader !== null)
{
- $this->name = $inputReader->name;
+ $this->name = trim($inputReader->name);
+ $this->category = strtolower(trim($inputReader->category));
if ($inputReader->banned !== null)
$this->banned = boolval($inputReader->banned);
@@ -26,6 +28,9 @@ class TagEditFormData implements IValidatable
public function validate(Validator $validator)
{
+ if ($this->category !== null)
+ $validator->validateLength($this->category, 1, 25, 'Tag category');
+
if ($this->name !== null)
$validator->validatePostTags([$this->name]);
diff --git a/src/Privilege.php b/src/Privilege.php
index 77d96a6d..602fc6fe 100644
--- a/src/Privilege.php
+++ b/src/Privilege.php
@@ -38,6 +38,7 @@ class Privilege
const LIST_TAGS = 'listTags';
const MASS_TAG = 'massTag';
const CHANGE_TAG_NAME = 'changeTagName';
+ const CHANGE_TAG_CATEGORY = 'changeTagCategory';
const CHANGE_TAG_IMPLICATIONS = 'changeTagImplications';
const CHANGE_TAG_SUGGESTIONS = 'changeTagSuggestions';
const BAN_TAGS = 'banTags';
diff --git a/src/Services/TagService.php b/src/Services/TagService.php
index 8a46c313..5514095a 100644
--- a/src/Services/TagService.php
+++ b/src/Services/TagService.php
@@ -143,6 +143,9 @@ class TagService
if ($formData->name !== null)
$this->updateTagName($tag, $formData->name);
+ if ($formData->category !== null)
+ $this->updateTagCategory($tag, $formData->category);
+
if ($formData->banned !== $tag->isBanned())
$tag->setBanned(boolval($formData->banned));
@@ -179,6 +182,14 @@ class TagService
$tag->setName($newName);
}
+ private function updateTagCategory(Tag $tag, $newCategory)
+ {
+ if ($newCategory === 'default')
+ $tag->setCategory($newCategory);
+ else
+ $tag->setCategory($newCategory);
+ }
+
private function updateImplications(Tag $tag, array $relatedNames)
{
$relatedNames = array_udiff($relatedNames, [$tag->getName()], 'strnatcasecmp');
diff --git a/src/Upgrades/Upgrade24.php b/src/Upgrades/Upgrade24.php
index e3d72c02..67b4dad9 100644
--- a/src/Upgrades/Upgrade24.php
+++ b/src/Upgrades/Upgrade24.php
@@ -1,7 +1,6 @@
getPDO();
+
+ $pdo->exec('ALTER TABLE tags ADD COLUMN category VARCHAR(25)');
+ }
+}
+
diff --git a/src/di.php b/src/di.php
index baa74639..9e1c3244 100644
--- a/src/di.php
+++ b/src/di.php
@@ -40,6 +40,7 @@ return [
$container->get(\Szurubooru\Upgrades\Upgrade22::class),
$container->get(\Szurubooru\Upgrades\Upgrade23::class),
$container->get(\Szurubooru\Upgrades\Upgrade24::class),
+ $container->get(\Szurubooru\Upgrades\Upgrade25::class),
];
}),
diff --git a/tests/Dao/TagDaoTest.php b/tests/Dao/TagDaoTest.php
index b82e68c6..4180ee03 100644
--- a/tests/Dao/TagDaoTest.php
+++ b/tests/Dao/TagDaoTest.php
@@ -13,8 +13,7 @@ final class TagDaoTest extends AbstractDatabaseTestCase
public function testSaving()
{
- $tag = new Tag();
- $tag->setName('test1');
+ $tag = $this->getTestTag('test');
$tag->setCreationTime(date('c', mktime(0, 0, 0, 10, 1, 2014)));
$this->assertFalse($tag->isBanned());
$tag->setBanned(true);
@@ -27,27 +26,17 @@ final class TagDaoTest extends AbstractDatabaseTestCase
public function testSavingRelations()
{
- $tag1 = new Tag();
- $tag1->setName('test 1');
- $tag1->setCreationTime(date('c'));
- $tag2 = new Tag();
- $tag2->setName('test 2');
- $tag2->setCreationTime(date('c'));
- $tag3 = new Tag();
- $tag3->setName('test 3');
- $tag3->setCreationTime(date('c'));
- $tag4 = new Tag();
- $tag4->setName('test 4');
- $tag4->setCreationTime(date('c'));
+ $tag1 = $this->getTestTag('test 1');
+ $tag2 = $this->getTestTag('test 2');
+ $tag3 = $this->getTestTag('test 3');
+ $tag4 = $this->getTestTag('test 4');
$tagDao = $this->getTagDao();
$tagDao->save($tag1);
$tagDao->save($tag2);
$tagDao->save($tag3);
$tagDao->save($tag4);
- $tag = new Tag();
- $tag->setName('test1');
- $tag->setCreationTime(date('c'));
+ $tag = $this->getTestTag('test');
$tag->setImpliedTags([$tag1, $tag3]);
$tag->setSuggestedTags([$tag2, $tag4]);
@@ -119,4 +108,13 @@ final class TagDaoTest extends AbstractDatabaseTestCase
{
return new TagDao($this->databaseConnection);
}
+
+ private function getTestTag($name)
+ {
+ $tag = new Tag();
+ $tag->setName($name);
+ $tag->setCreationTime(date('c'));
+ $tag->setCategory('default');
+ return $tag;
+ }
}
|