From c46cf0fdb72ebf5c02e786e35a78a477362728dc Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 20 Jun 2017 10:03:40 +0200 Subject: [PATCH] Fix form validation --- src/Gist/Controller/EditController.php | 10 ++++------ src/Gist/Resources/views/base.html.twig | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Gist/Controller/EditController.php b/src/Gist/Controller/EditController.php index 8c188ef..d9a4ceb 100644 --- a/src/Gist/Controller/EditController.php +++ b/src/Gist/Controller/EditController.php @@ -40,13 +40,11 @@ class EditController extends Controller $form->submit($request); $data = $form->getData(); - if (empty($form->getData()['content']) && !$request->files->has('file')) { + if (empty($form->getData()['content']) && $form->get('file')->getData()) { + $data['content'] = file_get_contents($form->get('file')->getData()->getPathName()); + unset($data['file']); + } elseif (empty($form->getData()['content'])) { $form->get('content')->addError(new FormError($app['translator']->trans('form.error.not_blank'))); - } elseif (empty($form->getData()['content']) && $request->files->has('file')) { - if (count($form->get('file')->getErrors()) === 0) { - $data['content'] = file_get_contents($form->get('file')->getData()->getPathName()); - unset($data['file']); - } } if ($form->isValid()) { diff --git a/src/Gist/Resources/views/base.html.twig b/src/Gist/Resources/views/base.html.twig index 046d5f1..9146d00 100644 --- a/src/Gist/Resources/views/base.html.twig +++ b/src/Gist/Resources/views/base.html.twig @@ -1,6 +1,6 @@ {% set theme_settings = app.settings.theme %} -{% set security_dettings = app.settings.security %} +{% set security_settings = app.settings.security %} {% block css %} @@ -56,14 +56,14 @@ {{ 'app.menu.my.logout.title'|trans }} - {% elseif security_dettings.enable_login %} + {% elseif security_settings.enable_login %}
  • {{ 'app.menu.my.login.title'|trans }}
    • - {% if security_dettings.enable_registration %} + {% if security_settings.enable_registration %}
  • {{ 'app.menu.my.register.title'|trans }}