mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 16:10:28 +00:00
Code Issues Projects Releases Wiki Activity

TagController: prevent tag deletion when renaming a tag with the same label

Browse source 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf 2020-04-04 22:08:08 +02:00
parent 39133eb796
commit a19caf8a37
2 changed files with 67 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Wallabag/CoreBundle/Controller/TagController.php
View file

@ -151,7 +151,10 @@ class TagController extends Controller
$form = $this->createForm(RenameTagType::class, new Tag()); $form = $this->createForm(RenameTagType::class, new Tag());
$form->handleRequest($request); $form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted()
&& $form->isValid()
&& $form->get('label')->getData() !== $tag->getLabel()
) {
$newTagLabel = $form->get('label')->getData(); $newTagLabel = $form->get('label')->getData();
$newTag = new Tag(); $newTag = new Tag();
$newTag->setLabel($newTagLabel); $newTag->setLabel($newTagLabel);
@ -171,12 +174,12 @@ class TagController extends Controller
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$em->flush(); $em->flush();
}
$this->get('session')->getFlashBag()->add( $this->get('session')->getFlashBag()->add(
'notice', 'notice',
'flashes.tag.notice.tag_renamed' 'flashes.tag.notice.tag_renamed'
); );
}
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true); $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);

58
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View file

@ -211,6 +211,10 @@ class TagControllerTest extends WallabagCoreTestCase
$client->submit($form, $data); $client->submit($form, $data);
$this->assertSame(302, $client->getResponse()->getStatusCode()); $this->assertSame(302, $client->getResponse()->getStatusCode());
$crawler = $client->followRedirect();
$this->assertContains('flashes.tag.notice.tag_renamed', $crawler->filter('body')->extract(['_text'])[0]);
$freshEntry = $client->getContainer() $freshEntry = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
@ -246,6 +250,60 @@ class TagControllerTest extends WallabagCoreTestCase
$this->assertTrue($newTag[0]->hasEntry($freshEntry2), 'New tag is assigned to the entry2.'); $this->assertTrue($newTag[0]->hasEntry($freshEntry2), 'New tag is assigned to the entry2.');
} }
public function testRenameTagWithSameLabel()
{
$tagLabel = 'same label';
$this->logInAs('admin');
$client = $this->getClient();
$tag = new Tag();
$tag->setLabel($tagLabel);
$entry = new Entry($this->getLoggedInUser());
$entry->setUrl('http://0.0.0.0/foobar');
$entry->addTag($tag);
$this->getEntityManager()->persist($entry);
$this->getEntityManager()->flush();
$this->getEntityManager()->clear();
// We make a first request to set an history and test redirection after tag deletion
$crawler = $client->request('GET', '/tag/list');
$form = $crawler->filter('#tag-' . $tag->getId() . ' form')->form();
$data = [
'tag[label]' => $tagLabel,
];
$client->submit($form, $data);
$this->assertSame(302, $client->getResponse()->getStatusCode());
$this->assertNotContains('flashes.tag.notice.tag_renamed', $crawler->filter('body')->extract(['_text'])[0]);
$freshEntry = $client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->find($entry->getId());
$tags = [];
$tagsFromEntry = $freshEntry->getTags()->toArray();
foreach ($tagsFromEntry as $key => $item) {
$tags[$key] = $item->getLabel();
}
$this->assertNotFalse(array_search($tag->getLabel(), $tags, true), 'Tag is still assigned to the entry.');
$newTag = $client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Tag')
->findByLabel($tagLabel);
$this->assertCount(1, $newTag);
$this->assertSame($tag->getId(), $newTag[0]->getId(), 'Tag is unchanged.');
$this->assertTrue($newTag[0]->hasEntry($freshEntry), 'Tag is still assigned to the entry.');
}
public function testAddUnicodeTagLabel() public function testAddUnicodeTagLabel()
{ {
$this->logInAs('admin'); $this->logInAs('admin');