From c13eda461f88ba16c88d7c398322a59b294e6c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Gomez?= <contact@kevingomez.fr>
Date: Mon, 16 Nov 2015 14:01:43 +0100
Subject: Clean the tagging rule creation form

---
 src/Wallabag/CoreBundle/Controller/ConfigController.php               | 2 +-
 .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle')

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index de1536c9..7a187710 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -102,7 +102,7 @@ class ConfigController extends Controller
 
         // handle tagging rule
         $taggingRule = new TaggingRule();
-        $newTaggingRule = $this->createForm(new TaggingRuleType(), $taggingRule);
+        $newTaggingRule = $this->createForm(new TaggingRuleType(), $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
         $newTaggingRule->handleRequest($request);
 
         if ($newTaggingRule->isValid()) {
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index e08393a2..d060311d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -200,7 +200,7 @@
                             </div>
                         </div>
 
-                        <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_tagging_rule) }}>
+                        {{ form_start(form.new_tagging_rule) }}
                             {{ form_errors(form.new_tagging_rule) }}
 
                             <div class="row">
@@ -332,7 +332,7 @@
                     </div>
 
                     {% if is_granted('ROLE_SUPER_ADMIN') %}
-                    <div id="set5" class="col s12">
+                    <div id="set6" class="col s12">
                         {{ form_start(form.new_user) }}
                             {{ form_errors(form.new_user) }}
 
-- 
cgit v1.2.3