diff --git a/src/Kunstmaan/AdminBundle/Controller/DefaultController.php b/src/Kunstmaan/AdminBundle/Controller/DefaultController.php index 49908cf61e..d699d487c8 100644 --- a/src/Kunstmaan/AdminBundle/Controller/DefaultController.php +++ b/src/Kunstmaan/AdminBundle/Controller/DefaultController.php @@ -67,7 +67,7 @@ public function editIndexAction(Request $request) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $em->persist($dashboardConfiguration); $em->flush($dashboardConfiguration); diff --git a/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php b/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php index 62f495dd5a..557d8d83a9 100644 --- a/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php +++ b/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php @@ -142,7 +142,7 @@ protected function doAddAction(AbstractAdminListConfigurator $configurator, $typ } // Don't redirect to listing when coming from ajax request, needed for url chooser. - if ($form->isValid() && !$request->isXmlHttpRequest()) { + if ($form->isSubmitted() && $form->isValid() && !$request->isXmlHttpRequest()) { $adminListEvent = new AdminListEvent($helper, $request, $form); $this->container->get('event_dispatcher')->dispatch( AdminListEvents::PRE_ADD, @@ -265,7 +265,7 @@ protected function doEditAction(AbstractAdminListConfigurator $configurator, $en } // Don't redirect to listing when coming from ajax request, needed for url chooser. - if ($form->isValid() && !$request->isXmlHttpRequest()) { + if ($form->isSubmitted() && $form->isValid() && !$request->isXmlHttpRequest()) { $adminListEvent = new AdminListEvent($helper, $request, $form); $this->container->get('event_dispatcher')->dispatch( AdminListEvents::PRE_EDIT, diff --git a/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php b/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php index fa1fee000a..d6ce555eff 100644 --- a/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php +++ b/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php @@ -129,7 +129,7 @@ public function indexAction(Request $request, $internalName) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $this->em->persist($config); $this->em->flush(); diff --git a/src/Kunstmaan/FormBundle/Helper/FormHandler.php b/src/Kunstmaan/FormBundle/Helper/FormHandler.php index 123963a6fb..be61cdc772 100644 --- a/src/Kunstmaan/FormBundle/Helper/FormHandler.php +++ b/src/Kunstmaan/FormBundle/Helper/FormHandler.php @@ -62,7 +62,7 @@ public function handleForm(FormPageInterface $page, Request $request, RenderCont $form = $formBuilder->getForm(); if ($request->getMethod() == 'POST') { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $formSubmission = new FormSubmission(); $formSubmission->setIpAddress($request->getClientIp()); $formSubmission->setNode($em->getRepository('KunstmaanNodeBundle:Node')->getNodeFor($page)); diff --git a/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractNewsletterController.php b/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractNewsletterController.php index dc2114bfa9..13a576b24b 100644 --- a/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractNewsletterController.php +++ b/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractNewsletterController.php @@ -40,7 +40,7 @@ public function subscribeAction(Request $request, $popup) $form = $this->createSubscriptionForm($thePopup); $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $this->handleSubscription($request, $form->getData(), $thePopup); return $this->render($this->getThanksTemplate(), array( diff --git a/src/Kunstmaan/MediaBundle/Controller/FolderController.php b/src/Kunstmaan/MediaBundle/Controller/FolderController.php index 90e72cdefc..bdda535a0e 100644 --- a/src/Kunstmaan/MediaBundle/Controller/FolderController.php +++ b/src/Kunstmaan/MediaBundle/Controller/FolderController.php @@ -170,7 +170,7 @@ public function subCreateAction(Request $request, $folderId) $form = $this->createForm(FolderType::class, $folder); if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $em->getRepository('KunstmaanMediaBundle:Folder')->save($folder); $this->addFlash( FlashTypes::SUCCESS, @@ -230,7 +230,7 @@ public function emptyAction(Request $request, $folderId) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $data = $form->getData(); $alsoDeleteFolders = $data['checked']; diff --git a/src/Kunstmaan/MediaBundle/Controller/MediaController.php b/src/Kunstmaan/MediaBundle/Controller/MediaController.php index 8032be6e0c..fdf13155a4 100644 --- a/src/Kunstmaan/MediaBundle/Controller/MediaController.php +++ b/src/Kunstmaan/MediaBundle/Controller/MediaController.php @@ -47,7 +47,7 @@ public function showAction(Request $request, $mediaId) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $media = $helper->getMedia(); $em->getRepository('KunstmaanMediaBundle:Media')->save($media); @@ -376,7 +376,7 @@ private function createAndRedirect(Request $request, $folderId, $type, $redirect $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $media = $helper->getMedia(); $media->setFolder($folder); $em->getRepository('KunstmaanMediaBundle:Media')->save($media); diff --git a/src/Kunstmaan/MediaBundle/Resources/views/Media/RemoteAudio/preview.html.twig b/src/Kunstmaan/MediaBundle/Resources/views/Media/RemoteAudio/preview.html.twig index 4eb986591b..19f8bfbb75 100644 --- a/src/Kunstmaan/MediaBundle/Resources/views/Media/RemoteAudio/preview.html.twig +++ b/src/Kunstmaan/MediaBundle/Resources/views/Media/RemoteAudio/preview.html.twig @@ -1,7 +1,12 @@ {% set handler = mediamanager.getHandler(media) %} {% set helper = handler.getFormHelper(media) %} -{% if helper.type == 'soundcloud' %} + +{% if helper.type is defined and helper.type == 'soundcloud' %}
+{% elseif 'audio' in media.contentType %} + {% endif %} diff --git a/src/Kunstmaan/SeoBundle/Controller/Admin/SettingsController.php b/src/Kunstmaan/SeoBundle/Controller/Admin/SettingsController.php index cee095428d..de1f9f45c2 100644 --- a/src/Kunstmaan/SeoBundle/Controller/Admin/SettingsController.php +++ b/src/Kunstmaan/SeoBundle/Controller/Admin/SettingsController.php @@ -47,7 +47,7 @@ public function robotsSettingsAction(Request $request) )); if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $em->persist($robot); $em->flush(); diff --git a/src/Kunstmaan/TranslatorBundle/Controller/TranslatorController.php b/src/Kunstmaan/TranslatorBundle/Controller/TranslatorController.php index 94dc59765f..d7f4ca5cd9 100644 --- a/src/Kunstmaan/TranslatorBundle/Controller/TranslatorController.php +++ b/src/Kunstmaan/TranslatorBundle/Controller/TranslatorController.php @@ -101,7 +101,7 @@ public function addAction(Request $request, $keyword = '', $domain = '', $locale $form->get('keyword')->addError($error); } - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { // Create translation $em->getRepository('KunstmaanTranslatorBundle:Translation')->createTranslations($data); $em->flush(); @@ -171,7 +171,7 @@ public function editAction(Request $request, $id) if ('POST' == $request->getMethod()) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { // Update translations $em->getRepository('KunstmaanTranslatorBundle:Translation')->updateTranslations($translation, $id); $em->flush(); diff --git a/src/Kunstmaan/UserManagementBundle/Controller/GroupsController.php b/src/Kunstmaan/UserManagementBundle/Controller/GroupsController.php index a3ccc6bb52..9dc5e3ad26 100644 --- a/src/Kunstmaan/UserManagementBundle/Controller/GroupsController.php +++ b/src/Kunstmaan/UserManagementBundle/Controller/GroupsController.php @@ -69,7 +69,7 @@ public function addAction(Request $request) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $em->persist($group); $em->flush(); @@ -113,7 +113,7 @@ public function editAction(Request $request, $id) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $em->persist($group); $em->flush(); diff --git a/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php b/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php index 96b3269bd9..3666e086b9 100644 --- a/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php +++ b/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php @@ -66,7 +66,7 @@ public function addAction(Request $request) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $em->persist($role); $em->flush(); @@ -110,7 +110,7 @@ public function editAction(Request $request, $id) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $em->persist($role); $em->flush(); diff --git a/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php b/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php index 93e917b365..f149125a2e 100644 --- a/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php +++ b/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php @@ -105,7 +105,7 @@ public function addAction(Request $request) if ($request->isMethod('POST')) { $form->handleRequest($request); - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { $user->setPasswordChanged(true); /* @var UserManager $userManager */ $userManager = $this->container->get('fos_user.user_manager'); @@ -185,7 +185,7 @@ public function editAction(Request $request, $id) $form->handleRequest($request); } - if ($form->isValid()) { + if ($form->isSubmitted() && $form->isValid()) { /* @var UserManager $userManager */ $userManager = $this->container->get('fos_user.user_manager'); $userManager->updateUser($user, true);