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

Use Uploaded by instead of Created by for the label.

Browse Source 
Move status to the last column on the table
This commit is contained in:
Rebecca Law
2016-05-11 14:45:20 +01:00
parent 46d5065297
commit 53fb1dcc4b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/partials/jobs/status.html
View File

@@ -16,5 +16,5 @@
Started {{ uploaded_at|format_datetime }} Started {{ uploaded_at|format_datetime }}
</p> </p>
{% endif %} {% endif %}
Created by {{ created_by }} Uploaded by {{ created_by }}
</div> </div>

8
app/templates/views/jobs/jobs.html
View File

@@ -24,7 +24,7 @@
caption="Recent activity", caption="Recent activity",
caption_visible=False, caption_visible=False,
empty_message='You haven’t sent any notifications yet', empty_message='You haven’t sent any notifications yet',
field_headings=['Job', 'Time', right_aligned_field_heading('Status'), 'Created By'] field_headings=['Job', 'Time', 'Uploaded by', right_aligned_field_heading('Status')]
) %} ) %}
{% call field() %} {% call field() %}
<a href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a> <a href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>
@@ -32,12 +32,12 @@
{% call field() %} {% call field() %}
{{ item.created_at | format_datetime}} {{ item.created_at | format_datetime}}
{% endcall %} {% endcall %}
{% call field(align='right') %}
{{ item.status }}
{% endcall %}
{% call field() %} {% call field() %}
{{ item.created_by.name }} {{ item.created_by.name }}
{% endcall %} {% endcall %}
{% call field(align='right') %}
{{ item.status }}
{% endcall %}
{% endcall %} {% endcall %}

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

@@ -69,7 +69,7 @@ def test_should_show_updates_for_one_job_as_json(
assert 'Recipient' in content['notifications'] assert 'Recipient' in content['notifications']
assert 'Status' in content['notifications'] assert 'Status' in content['notifications']
assert 'Started' in content['status'] assert 'Started' in content['status']
assert 'Created by Test User' in content['status'] assert 'Uploaded by Test User' in content['status']
def test_should_show_notifications_for_a_service(app_, def test_should_show_notifications_for_a_service(app_,