From 59f94300dbc8a3a00d80c620a208a5c218a62516 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 21 Jun 2023 10:20:42 -0600 Subject: [PATCH] Importexport: Always show import preview, even if there are warnings --- .../inc/class.importexport_import_ui.inc.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php index fc75ede0fc..7bcc5df561 100644 --- a/importexport/inc/class.importexport_import_ui.inc.php +++ b/importexport/inc/class.importexport_import_ui.inc.php @@ -137,13 +137,13 @@ use EGroupware\Api\Etemplate; if($content['dry-run']) { $preview = $this->preview($plugin, $file, $definition_obj); - if(trim($this->message) == '') - { - // Clear first, to prevent request from being collected if the result is the same - $template->setElementAttribute('preview', 'value', ''); - $template->setElementAttribute('preview', 'value', $preview); - return; - } + + $template->setElementAttribute('message', 'value', $this->message); + + // Clear first, to prevent request from being collected if the result is the same + $template->setElementAttribute('preview', 'value', ''); + $template->setElementAttribute('preview', 'value', $preview); + return; } else {