pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1805 from wallabag/v2-assign-comma-tags

Browse Source 
Fix #1768 Split tags with commas from UI
This commit is contained in:
Nicolas Lœuillet
2016-03-28 09:42:13 +02:00
parent cc8c2d315f 2baca964f3
commit ba2157b270
3 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Wallabag/CoreBundle/Controller/TagController.php
View File

@ -20,25 +20,17 @@ class TagController extends Controller
*/
public function addTagFormAction(Request $request, Entry $entry)
{
$tag = new Tag();
$form = $this->createForm(NewTagType::class, $tag);
$form = $this->createForm(NewTagType::class, new Tag());
$form->handleRequest($request);
if ($form->isValid()) {
$existingTag = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Tag')
->findOneByLabel($tag->getLabel());
$this->get('wallabag_core.content_proxy')->assignTagsToEntry(
$entry,
$form->get('label')->getData()
);
$em = $this->getDoctrine()->getManager();
if (is_null($existingTag)) {
$entry->addTag($tag);
$em->persist($tag);
} elseif (!$existingTag->hasEntry($entry)) {
$entry->addTag($existingTag);
$em->persist($existingTag);
}
$em->persist($entry);
$em->flush();
$this->get('session')->getFlashBag()->add(