darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 15:48:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make ‘too many rows’ error actually work

Browse Source 
Was using the wrong attribute name on the instance of `RecipientCSV`
(needed to match 19df1eb4ef/notifications_utils/recipients.py (L156) )

The ‘can’t show file contents’ message wasn’t showing up, now it is.
This commit is contained in:
Chris Hill-Scott
2016-10-17 10:20:14 +01:00
parent c4df3d1109
commit fb906fbfdb
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/views/check.html
View File

@@ -15,7 +15,7 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{% if recipients.has_too_many_rows %} {% if recipients.too_many_rows %}
<div class="bottom-gutter"> <div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %} {% call banner_wrapper(type='dangerous') %}
@@ -174,8 +174,7 @@
{% call(item, row_number) list_table( {% call(item, row_number) list_table(
recipients.initial_annotated_rows_with_errors if row_errors and not recipients.missing_column_headers else recipients.initial_annotated_rows, recipients.initial_annotated_rows_with_errors if row_errors and not recipients.missing_column_headers else recipients.initial_annotated_rows,
caption=original_file_name, caption=original_file_name,
field_headings=['1'] + recipients.column_headers, field_headings=['1'] + recipients.column_headers
empty_message='Can’t show the contents of this file'
) %} ) %}
{{ index_field(item.index + 2) }} {{ index_field(item.index + 2) }}
{% for column in recipients.column_headers %} {% for column in recipients.column_headers %}
@@ -203,7 +202,12 @@
{% endif %} {% endif %}
{% endcall %} {% endcall %}
{% if count_of_displayed_recipients < count_of_recipients %}
{% if recipients.too_many_rows %}
<p class="table-show-more-link">
Can’t show the contents of this file
</p>
{% elif count_of_displayed_recipients < count_of_recipients %}
<p class="table-show-more-link"> <p class="table-show-more-link">
{% if row_errors and not recipients.missing_column_headers %} {% if row_errors and not recipients.missing_column_headers %}
Only showing the first {{ count_of_displayed_recipients }} rows with errors Only showing the first {{ count_of_displayed_recipients }} rows with errors

2
tests/app/main/views/test_send.py
View File

@@ -795,7 +795,7 @@ def test_check_messages_shows_over_max_row_error(
mock_recipients = mocker.patch('app.main.views.send.RecipientCSV').return_value mock_recipients = mocker.patch('app.main.views.send.RecipientCSV').return_value
mock_recipients.max_rows = 11111 mock_recipients.max_rows = 11111
mock_recipients.__len__.return_value = 99999 mock_recipients.__len__.return_value = 99999
mock_recipients.has_too_many_rows.return_value = True mock_recipients.too_many_rows.return_value = True
client.login(api_user_active) client.login(api_user_active)
with client.session_transaction() as session: with client.session_transaction() as session: