Fixes for not imported columns on step by step import. Tests for this feature.

1 files changed, 7 insertions, 2 deletions

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 %}