From c68ddc92ff202bf34b32a0191f54d080cc89203e Mon Sep 17 00:00:00 2001 From: marijo-pavlov Date: Fri, 31 Jul 2015 13:54:53 +0200 Subject: [PATCH 1/4] Modified creating users --- Controller/UserAdminController.php | 8 ++++++++ Resources/views/User/new.html.twig | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Controller/UserAdminController.php b/Controller/UserAdminController.php index c2aebdc..2fcc3dc 100755 --- a/Controller/UserAdminController.php +++ b/Controller/UserAdminController.php @@ -48,6 +48,14 @@ public function createAction(Request $request) if ($form->isValid()) { $em = $this->getDoctrine()->getManager(); + if($em->getRepository('LiveVotingBundle:User')->findOneByEmail($user->getEmail())){ + $request->getSession()->getFlashBag()->add( + 'error', 'That user already exists.' + ); + + return $this->redirect($this->generateUrl('admin_user_new')); + } + $em->persist($user); $em->flush(); diff --git a/Resources/views/User/new.html.twig b/Resources/views/User/new.html.twig index 3863086..2945d8c 100644 --- a/Resources/views/User/new.html.twig +++ b/Resources/views/User/new.html.twig @@ -4,7 +4,14 @@ {% block mainHeading %}New user{% endblock %} -{% block body %} +{% block body %} + +{% for flashMessage in app.Session.flashbag.get('error') %} +
+
{{flashMessage}}
+
+{% endfor %} +
{{ form(form) }} @@ -16,4 +23,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} From a4140bc35f0537c330c71c905b9ccab223e76355 Mon Sep 17 00:00:00 2001 From: vjekoart Date: Fri, 31 Jul 2015 15:45:25 +0200 Subject: [PATCH 2/4] Minor frontend changes. --- Resources/views/Event/index.html.twig | 4 ++-- Resources/views/base.html.twig | 2 +- Resources/views/baseAdmin.html.twig | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Resources/views/Event/index.html.twig b/Resources/views/Event/index.html.twig index 3d5af55..df21507 100755 --- a/Resources/views/Event/index.html.twig +++ b/Resources/views/Event/index.html.twig @@ -28,7 +28,7 @@ {% for entity in entities %} - {{ entity.name }} + {{ entity.name }} {{ entity.stateName }} @@ -47,7 +47,7 @@ Live --> - + diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig index 19f6448..08e4f53 100644 --- a/Resources/views/base.html.twig +++ b/Resources/views/base.html.twig @@ -4,7 +4,7 @@ {% block title %}LiveVoting app{% endblock %} - + diff --git a/Resources/views/baseAdmin.html.twig b/Resources/views/baseAdmin.html.twig index 4d5db0f..c6b6207 100644 --- a/Resources/views/baseAdmin.html.twig +++ b/Resources/views/baseAdmin.html.twig @@ -4,6 +4,16 @@ {% block title %}Admin panel{% endblock %} + + + + + + + + + + From 6771a23146fc5d6284b119d68be224af10b7a1a1 Mon Sep 17 00:00:00 2001 From: marijo-pavlov Date: Fri, 31 Jul 2015 15:49:59 +0200 Subject: [PATCH 3/4] Added md5 hash column to csv export of users --- Controller/ExportController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Controller/ExportController.php b/Controller/ExportController.php index 3a2bbe3..639df29 100644 --- a/Controller/ExportController.php +++ b/Controller/ExportController.php @@ -25,11 +25,13 @@ public function generateCsvAction() { $handle = fopen('php://output','w+'); - fputcsv($handle, array('Email','Gender','Country','City','T-Shirt','Food preference'),';'); + fputcsv($handle, array('Email', 'Hash', 'Gender','Country','City','T-Shirt','Food preference'),';'); //$results = $this->connection->query('SELECT email, gender, country, city, tshirt, foodPreference FROM user'); //$results->execute(); foreach ($users as $user) { - fputcsv($handle, array($user->getEmail(), + fputcsv($handle, array( + $user->getEmail(), + md5($this->container->getParameter('email_hash_prefix').$user->getEmail()), $user->getGender(), $user->getCountry(), $user->getCity(), @@ -47,4 +49,4 @@ public function generateCsvAction() { return $response; } -} \ No newline at end of file +} From 55f34ee97c942f85b288c85c710dcb32cc31d51f Mon Sep 17 00:00:00 2001 From: vjekoart Date: Fri, 31 Jul 2015 15:54:35 +0200 Subject: [PATCH 4/4] Added extra space on xs screens in heading. --- Resources/public/css/content.css | 4 ++++ Resources/views/Answer/index.html.twig | 4 ++-- Resources/views/Dashboard/index.html.twig | 2 +- Resources/views/Index/index.html.twig | 4 ++-- Resources/views/Index/landing.html.twig | 4 ++-- Resources/views/Presentation/user.html.twig | 4 ++-- Resources/views/Result/liveIndex.html.twig | 4 ++-- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Resources/public/css/content.css b/Resources/public/css/content.css index 1ead403..9b05cfa 100755 --- a/Resources/public/css/content.css +++ b/Resources/public/css/content.css @@ -91,6 +91,10 @@ } .box .actions.single-action { text-align: center; } + + .box .text-wrapper.extra-margin { + margin-top: 1em; + } } diff --git a/Resources/views/Answer/index.html.twig b/Resources/views/Answer/index.html.twig index bda1872..5a4e4d7 100644 --- a/Resources/views/Answer/index.html.twig +++ b/Resources/views/Answer/index.html.twig @@ -14,7 +14,7 @@
-
+

{{ event.getName }}

@@ -36,7 +36,7 @@
-
+

{{ event.getName }}

diff --git a/Resources/views/Dashboard/index.html.twig b/Resources/views/Dashboard/index.html.twig index fa09e34..126e8c2 100644 --- a/Resources/views/Dashboard/index.html.twig +++ b/Resources/views/Dashboard/index.html.twig @@ -95,7 +95,7 @@
-
+

Current happenings:

diff --git a/Resources/views/Index/index.html.twig b/Resources/views/Index/index.html.twig index a8f917b..f97b187 100644 --- a/Resources/views/Index/index.html.twig +++ b/Resources/views/Index/index.html.twig @@ -14,7 +14,7 @@
-
+

{{ event.getName }}

@@ -39,7 +39,7 @@
-
+

{{ event.getName }}

diff --git a/Resources/views/Index/landing.html.twig b/Resources/views/Index/landing.html.twig index e0b64b7..62e3ea8 100755 --- a/Resources/views/Index/landing.html.twig +++ b/Resources/views/Index/landing.html.twig @@ -14,7 +14,7 @@
-
+

{{ event.getName }}

@@ -42,7 +42,7 @@
-
+

{{ event.getName }}

diff --git a/Resources/views/Presentation/user.html.twig b/Resources/views/Presentation/user.html.twig index 5ea8bc8..44cff79 100644 --- a/Resources/views/Presentation/user.html.twig +++ b/Resources/views/Presentation/user.html.twig @@ -9,7 +9,7 @@
-
+

My lectures

@@ -42,7 +42,7 @@
-
+

{{ entity[0].name }}

diff --git a/Resources/views/Result/liveIndex.html.twig b/Resources/views/Result/liveIndex.html.twig index 482982d..63a3b7b 100755 --- a/Resources/views/Result/liveIndex.html.twig +++ b/Resources/views/Result/liveIndex.html.twig @@ -14,7 +14,7 @@
-
+

{{ event.getName }}

@@ -36,7 +36,7 @@
-
+

{{ event.getName }}