From eb395db2d6fe8392089be40488b9d98ed0bf697b Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 20 Dec 2017 11:59:51 +0000
Subject: [PATCH] Fix error when file has header rows but no data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously the error was saying ‘It needs at least one row of data, and
columns called None’.
---
 app/templates/views/check/column-errors.html | 18 ++++++++++++------
 tests/app/main/views/test_send.py            | 10 ++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html
index 553449600..6f3b626d1 100644
--- a/app/templates/views/check/column-errors.html
+++ b/app/templates/views/check/column-errors.html
@@ -38,12 +38,18 @@
         <h1 class='banner-title' data-module="track-error" data-error-type="No rows" data-error-label="{{ upload_id }}">
           Your file is missing some rows
         </h1>
-        <p>
-          It needs at least one row of data, and {{ recipients.missing_column_headers | sort() | formatted_list(
-            prefix='a column called',
-            prefix_plural='columns called'
-          ) }}.
-        </p>
+        {% if recipients.missing_column_headers %}
+          <p>
+            It needs at least one row of data, and {{ recipients.missing_column_headers | sort() | formatted_list(
+              prefix='a column called',
+              prefix_plural='columns called'
+            ) }}.
+          </p>
+        {% else %}
+          <p>
+            It needs at least one row of data.
+          </p>
+        {% endif %}
 
       {% elif not recipients.has_recipient_columns %}
 
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index d8b5b40ee..bc7423dea 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -352,6 +352,16 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
             'Skip to file contents'
         )
     ),
+    (
+        """
+            phone number, name
+        """,
+        (
+            'Your file is missing some rows '
+            'It needs at least one row of data. '
+            'Skip to file contents'
+        )
+    ),
     (
         "+447700900986",
         (