Use Uploaded by instead of Created by for the label.

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

View File

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

View File

@@ -24,7 +24,7 @@
caption="Recent activity",
caption_visible=False,
empty_message='You havent 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() %}
<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() %}
{{ item.created_at | format_datetime}}
{% endcall %}
{% call field(align='right') %}
{{ item.status }}
{% endcall %}
{% call field() %}
{{ item.created_by.name }}
{% endcall %}
{% call field(align='right') %}
{{ item.status }}
{% endcall %}
{% endcall %}

View File

@@ -69,7 +69,7 @@ def test_should_show_updates_for_one_job_as_json(
assert 'Recipient' in content['notifications']
assert 'Status' in content['notifications']
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_,