entrouvert
/
lingo
15
0
Fork 0
Code Issues Pull Requests 6 Releases Wiki Activity

invoicing: don't display error links for a draft pool (#74492)
gitea-wip/lingo/pipeline/pr-main This commit looks good Details

This commit is contained in:
Lauréline Guérin 2023-02-14 15:30:52 +01:00
parent 85125fa29a
commit ba1379c5d8
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lingo/invoicing/templates/lingo/invoicing/manager_line_detail_fragment.html
View File

@ -27,7 +27,7 @@
{% endspaceless %}</span>
{% if line.status != 'success' %}
({{ line.get_error_display }})
{% if line.status == 'error' %}
{% if line.status == 'error' and not pool.draft %}
<br />
{% if line.error_status %}
<a class="error-status" href="{% url 'lingo-manager-invoicing-line-set-error-status' pk=object.pk pool_pk=pool.pk line_pk=line.pk status='reset' %}">{% trans "reset" %}</a>

29
tests/invoicing/manager/test_campaign.py
View File

@ -960,6 +960,11 @@ def test_journal_pool_lines(app, admin_user, draft):
def format_status(value):
return (' '.join([v.strip() for v in value.split('\n')])).strip()
if draft:
error_links = ''
else:
error_links = ' ignore - mark as fixed'
app = login(app)
resp = app.get('/manage/invoicing/campaign/%s/pool/%s/journal/' % (campaign.pk, pool.pk))
assert format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[0].pk).text()) == 'Success'
@ -977,7 +982,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[2].pk).text())
== 'Error (No matching criteria for category: cat-foo) ignore - mark as fixed'
== 'Error (No matching criteria for category: cat-foo)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[2].pk).text().strip()
@ -985,7 +990,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[3].pk).text())
== 'Error (Multiple default criteria found for category: cat-foo) ignore - mark as fixed'
== 'Error (Multiple default criteria found for category: cat-foo)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[3].pk).text().strip()
@ -993,7 +998,8 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[4].pk).text())
== 'Error (Impossible to determine a pricing for criterias: qf-1 (category: qf), bar (category: foo)) ignore - mark as fixed'
== 'Error (Impossible to determine a pricing for criterias: qf-1 (category: qf), bar (category: foo))%s'
% error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[4].pk).text().strip()
@ -1001,7 +1007,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[5].pk).text())
== 'Error (Pricing is not a decimal: foobar) ignore - mark as fixed'
== 'Error (Pricing is not a decimal: foobar)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[5].pk).text().strip()
@ -1009,7 +1015,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[6].pk).text())
== 'Error (Unknown check status: unknown) ignore - mark as fixed'
== 'Error (Unknown check status: unknown)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[6].pk).text().strip()
@ -1017,7 +1023,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[7].pk).text())
== 'Error (Event is not checked) ignore - mark as fixed'
== 'Error (Event is not checked)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[7].pk).text().strip()
@ -1025,7 +1031,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[8].pk).text())
== 'Error (Booking is not checked) ignore - mark as fixed'
== 'Error (Booking is not checked)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[8].pk).text().strip()
@ -1033,7 +1039,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[9].pk).text())
== 'Error (Multiple booking found) ignore - mark as fixed'
== 'Error (Multiple booking found)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[9].pk).text().strip()
@ -1041,7 +1047,7 @@ def test_journal_pool_lines(app, admin_user, draft):
)
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[10].pk).text())
== 'Error (Check type error: not found) ignore - mark as fixed'
== 'Error (Check type error: not found)%s' % error_links
)
assert (
resp.pyquery('tr[data-details-for-line-id="%s"] td pre' % lines[10].pk).text().strip()
@ -1050,7 +1056,8 @@ def test_journal_pool_lines(app, admin_user, draft):
if draft:
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[11].pk).text())
== 'Error (Check type error: pricing not configured (group: foo-bar, check type: foo-reason)) ignore - mark as fixed'
== 'Error (Check type error: pricing not configured (group: foo-bar, check type: foo-reason))%s'
% error_links
)
else:
assert (
@ -1064,7 +1071,7 @@ def test_journal_pool_lines(app, admin_user, draft):
if draft:
assert (
format_status(resp.pyquery('tr[data-line-id="%s"] td.status' % lines[12].pk).text())
== 'Error (Check type error: wrong kind (group: foo-bar, check type: foo-reason)) ignore - mark as fixed'
== 'Error (Check type error: wrong kind (group: foo-bar, check type: foo-reason))%s' % error_links
)
else:
assert (