Remove extra loop in result page if errors

saritasa-nest · Nov 29, 2024 · 596658b · 596658b
1 parent b20bfab
commit 596658b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 49 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -9,6 +9,7 @@ UNRELEASED
   * Add displaying resources for import form
   * Fix autofill `Format` by file extension
   * Add `Totals` section
+  * Remove extra loop if errors in input file (https://github.com/saritasa-nest/django-import-export-extensions/issues/74)
 
 * Fixed display of progress bar when task is waiting to run (https://github.com/saritasa-nest/django-import-export-extensions/issues/68)
 * Improve progress bar style (https://github.com/saritasa-nest/django-import-export-extensions/issues/72)

diff --git a/import_export_extensions/templates/admin/import_export_extensions/celery_import_results.html b/import_export_extensions/templates/admin/import_export_extensions/celery_import_results.html
@@ -107,59 +107,57 @@ <h2>{% trans "Errors" %}</h2>
             </li>
           {% endfor %}
         {% endfor %}
-        {% for invalid_row in result.invalid_rows %}
-          <h2>{% trans "Some rows failed to validate" %}</h2>
+        <h2>{% trans "Some rows failed to validate" %}</h2>
 
-          <p>{% trans "Please correct these errors in your data where possible, then reupload it using the form above." %}</p>
-          <table class="import-preview">
-            <thead>
+        <p>{% trans "Please correct these errors in your data where possible, then reupload it using the form above." %}</p>
+        <table class="import-preview">
+          <thead>
+            <tr>
+              <th>{% trans "Row" %}</th>
+              <th>{% trans "Errors" %}</th>
+              {% for field in result.diff_headers %}
+                <th>{{ field }}</th>
+              {% endfor %}
+            </tr>
+          </thead>
+          <tbody>
+            {% for row in result.invalid_rows %}
               <tr>
-                <th>{% trans "Row" %}</th>
-                <th>{% trans "Errors" %}</th>
-                {% for field in result.diff_headers %}
-                  <th>{{ field }}</th>
+                <td>{{ row.number }} </td>
+                <td class="errors">
+                  <span class="validation-error-count">{{ row.error_count }}</span>
+                  <div class="validation-error-container">
+                    <ul class="validation-error-list">
+                      {% for field_name, error_list in row.field_specific_errors.items %}
+                        <li>
+                          <span class="validation-error-field-label">{{ field_name }}</span>
+                          <ul>
+                            {% for error in error_list %}
+                              <li>{{ error }}</li>
+                            {% endfor %}
+                          </ul>
+                        </li>
+                      {% endfor %}
+                      {% if row.non_field_specific_errors %}
+                        <li>
+                          <span class="validation-error-field-label">{% trans "Non field specific" %}</span>
+                          <ul>
+                            {% for error in row.non_field_specific_errors %}
+                              <li>{{ error }}</li>
+                            {% endfor %}
+                          </ul>
+                        </li>
+                      {% endif %}
+                    </ul>
+                  </div>
+                </td>
+                {% for field in row.values %}
+                  <td>{{ field }}</td>
                 {% endfor %}
               </tr>
-            </thead>
-            <tbody>
-              {% for row in result.invalid_rows %}
-                <tr>
-                  <td>{{ row.number }} </td>
-                  <td class="errors">
-                    <span class="validation-error-count">{{ row.error_count }}</span>
-                    <div class="validation-error-container">
-                      <ul class="validation-error-list">
-                        {% for field_name, error_list in row.field_specific_errors.items %}
-                          <li>
-                            <span class="validation-error-field-label">{{ field_name }}</span>
-                            <ul>
-                              {% for error in error_list %}
-                                <li>{{ error }}</li>
-                              {% endfor %}
-                            </ul>
-                          </li>
-                        {% endfor %}
-                        {% if row.non_field_specific_errors %}
-                          <li>
-                            <span class="validation-error-field-label">{% trans "Non field specific" %}</span>
-                            <ul>
-                              {% for error in row.non_field_specific_errors %}
-                                <li>{{ error }}</li>
-                              {% endfor %}
-                            </ul>
-                          </li>
-                        {% endif %}
-                      </ul>
-                    </div>
-                  </td>
-                  {% for field in row.values %}
-                    <td>{{ field }}</td>
-                  {% endfor %}
-                </tr>
-              {% endfor %}
-            </tbody>
-          </table>
-        {% endfor %}
+            {% endfor %}
+          </tbody>
+        </table>
       </ul>
     {% endif %}
     {% if import_job.import_status in import_job.success_statuses %}