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

Change logic around to be clearer

Browse Source 
Think this is a clearer expression of what the intent it.
This commit is contained in:
Chris Hill-Scott
2020-05-07 09:50:03 +01:00
parent f30187b529
commit 8655e519aa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/jobs.py
View File

@@ -285,7 +285,7 @@ def get_notifications(service_id, message_type, status_override=None):
limit_days=service_data_retention_days, limit_days=service_data_retention_days,
prev_page=prev_page, prev_page=prev_page,
next_page=next_page, next_page=next_page,
more_than_can_be_shown=(next_page and search_term), show_pagination=(not search_term),
status=request.args.get('status'), status=request.args.get('status'),
message_type=message_type, message_type=message_type,
download_link=download_link, download_link=download_link,

6
app/templates/views/activity/notifications.html
View File

@@ -33,12 +33,12 @@
</div> </div>
{% endif %} {% endif %}
{% if more_than_can_be_shown %} {% if show_pagination %}
{{ previous_next_navigation(prev_page, next_page) }}
{% elif next_page %}
<p class="table-show-more-link"> <p class="table-show-more-link">
Only showing the first 50 messages Only showing the first 50 messages
</p> </p>
{% else %}
{{ previous_next_navigation(prev_page, next_page) }}
{% endif %} {% endif %}
</div> </div>