From 86dcac2bfb60cb9a59eaa30cb0d273595f3187a6 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 29 Mar 2018 14:12:29 +0200
Subject: Fixes for not imported columns on step by step import. Tests for this
 feature.

---
 ishtar_common/templates/ishtar/import_step_by_step.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/ishtar/import_step_by_step.html b/ishtar_common/templates/ishtar/import_step_by_step.html
index 44c5389d3..9aca80837 100644
--- a/ishtar_common/templates/ishtar/import_step_by_step.html
+++ b/ishtar_common/templates/ishtar/import_step_by_step.html
@@ -85,7 +85,7 @@
             <td>{{idx}}</td>
             <td>{{name|safe}}</td>
             <td>{{raw}}</td>
-            <td><textarea name="col-{{idx}}">{{raw}}</textarea></td>
+            <td><textarea name="col-{{idx}}">{{raw|safe}}</textarea></td>
         </tr>{% endfor %}
     </table>
 
@@ -121,13 +121,18 @@
 
 {% else %}
 
-{% if not have_change %}
+{% if not have_change and not new_objects %}
 <div class="alert alert-success" role="alert">
     <p>{% trans "No change for this item." %}</p>
 </div>
 {% else %}
 <div class="alert alert-warning" role="alert">
+    {% if have_change %}
     <p>{% trans "Changes will be made for this item" %}</p>
+    {% endif %}
+    {% if new_objects %}
+    <p>{% trans "New objects will be created." %}</p>
+    {% endif %}
 </div>
 {% endif %}
 
-- 
cgit v1.2.3