From ca17abce2d3963e266bee905ab084ddfa7e1ff18 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 30 Sep 2016 21:01:36 +0200
Subject: Create user config in one place

Using a listener, user config is now created when a user:

- is created from the command line
- register (with or without email confirmation)
- is created from the config panel
---
 src/Wallabag/UserBundle/Resources/config/services.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index 05830555..eb9c8e67 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -20,3 +20,15 @@ services:
         factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
         arguments:
             - WallabagUserBundle:User
+
+    wallabag_user.create_config:
+        class: Wallabag\UserBundle\EventListener\CreateConfigListener
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "%wallabag_core.theme%"
+            - "%wallabag_core.items_on_page%"
+            - "%wallabag_core.rss_limit%"
+            - "%wallabag_core.language%"
+            - "%wallabag_core.reading_speed%"
+        tags:
+            - { name: kernel.event_subscriber }
-- 
cgit v1.2.3


From fb7354c4a430f4f4916a1247aa1b1bf564ead0da Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 30 Sep 2016 21:02:44 +0200
Subject: Fix bad template name

When a user register, the template displayed saying it should now check its email was misspelled.
Resulting in displaying the default one (with margin issue).
---
 .../Resources/views/Registration/checkEmail.html.twig         | 11 -----------
 .../Resources/views/Registration/check_email.html.twig        | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig
 create mode 100644 src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig
deleted file mode 100644
index 50937276..00000000
--- a/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "FOSUserBundle::layout.html.twig" %}
-
-{% trans_default_domain 'FOSUserBundle' %}
-
-{% block fos_user_content %}
-<div class="card-content">
-    <div class="row">
-        <p>{{ 'registration.check_email'|trans({'%email%': user.email}) }}</p>
-    </div>
-</div>
-{% endblock fos_user_content %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig
new file mode 100644
index 00000000..50937276
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig
@@ -0,0 +1,11 @@
+{% extends "FOSUserBundle::layout.html.twig" %}
+
+{% trans_default_domain 'FOSUserBundle' %}
+
+{% block fos_user_content %}
+<div class="card-content">
+    <div class="row">
+        <p>{{ 'registration.check_email'|trans({'%email%': user.email}) }}</p>
+    </div>
+</div>
+{% endblock fos_user_content %}
-- 
cgit v1.2.3