Skip to content

Commit

Permalink
Merge branch '4.0'
Browse files Browse the repository at this point in the history 
* 4.0:
  Fix audio display if media type isn't soundcloud
  Add form isSubmitted before isValid
  • Loading branch information
@Devolicious
Devolicious committed Aug 1, 2017
2 parents 40e6d27 + 4334070 commit 9201534
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/Kunstmaan/AdminBundle/Controller/DefaultController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/AdminListBundle/Controller/AdminListController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/ConfigBundle/Controller/ConfigController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/FormBundle/Helper/FormHandler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/LeadGenerationBundle/Controller/AbstractNewsletterController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/MediaBundle/Controller/FolderController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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'];
Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/MediaBundle/Controller/MediaController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
7 changes: 6 additions & 1 deletion src/Kunstmaan/MediaBundle/Resources/views/Media/RemoteAudio/preview.html.twig
View file
Original file line number Diff line number Diff line change
@@ -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' %}
<div class="embed-responsive embed-responsive-16by9">
<iframe width="560" height="315" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/{{ helper.code }}&amp;auto_play=false&amp;hide_related=false&amp;visual=true" class="embed-responsive-item"></iframe>
</div>
{% elseif 'audio' in media.contentType %}
<audio controls>
<source src="{{ media.url }}" />
</audio>
{% endif %}
2 changes: 1 addition & 1 deletion src/Kunstmaan/SeoBundle/Controller/Admin/SettingsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/TranslatorBundle/Controller/TranslatorController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/UserManagementBundle/Controller/GroupsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/UserManagementBundle/Controller/RolesController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/UserManagementBundle/Controller/UsersController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9201534

Please sign in to comment.