Explicitly show error message if import queue is empty

Close #3804
See #4379

diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 9fb4a75fbfc5f59bac217b37f6c7183e3bbd241f..19b28fdb8199e68aee62fff4480ba54009ef0987 100644 (file)
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -119,7 +119,7 @@
        {/if}
 {else}
        <form method="post" action="{link controller='DataImport'}{/link}">
-               <section class="section">
+               <section class="section{if $errorField === 'selectedData'} formError{/if}">
                        <header class="sectionHeader">
                                <h2 class="sectionTitle">{lang}wcf.acp.dataImport.configure.data{/lang}</h2>
                                <p class="sectionDescription">{lang}wcf.acp.dataImport.configure.data.description{/lang}</p>
@@ -139,6 +139,16 @@
                                </dl>
                        {/foreach}
                        
+                       {if $errorField === 'selectedData'}
+                               <small class="innerError">
+                                       {if $errorType === 'empty'}
+                                               {lang}wcf.global.form.error.empty{/lang}
+                                       {else}
+                                               {lang}wcf.acp.dataImport.configure.data.error.{$errorType}{/lang}
+                                       {/if}
+                               </small>
+                       {/if}
+                       
                        {event name='dataFields'}
                </section>
                

diff --git a/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php b/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
index ce8956a8f020df914a442fc5293ee082a822ade0..1ee66d6439b7efe2afb4c886eff324586b28d0d2 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
@@ -247,6 +247,8 @@ class DataImportForm extends AbstractForm
         // validate selected data
         if (!$this->exporter->validateSelectedData($this->selectedData)) {
             throw new UserInputException('selectedData');
+        } elseif (empty($this->exporter->getQueue())) {
+            throw new UserInputException('selectedData');
         }
 
         // validate file access