Merge pull request #2879 from matteocoder/matteocoder-patch-1

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Controller / ReadabilityController.php

diff --git a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php
index 8775e8a3b5b0bfb8de330b1f4e1481a1da37b5ee..aa732ddd56acb80647f03f950b77236d9e6d219f 100644 (file)
--- a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php
+++ b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php
@@ -26,7 +26,7 @@ class ReadabilityController extends Controller
             $readability->setProducer($this->get('wallabag_import.producer.redis.readability'));
         }
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $file = $form->get('file')->getData();
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = 'readability_'.$this->getUser()->getId().'.json';
@@ -46,6 +46,12 @@ class ReadabilityController extends Controller
                         '%skipped%' => $summary['skipped'],
                     ]);
 
+                    if (0 < $summary['queued']) {
+                        $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+                            '%queued%' => $summary['queued'],
+                        ]);
+                    }
+
                     unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name);
                 }