general: remove status from receipt page (#55494) #149

Merged
lguerin merged 1 commits from wip/55494-remove-status-from-summary into main 2023-03-10 10:14:30 +01:00
4 changed files with 2 additions and 16 deletions

View File

@ -5531,7 +5531,7 @@ def test_form_worklow_multiple_identical_status(pub):
formdata.user_id = user.id
formdata.store()
resp = app.get(formdata.get_url())
assert resp.text.count('Status1') == 3 # once in summary and two in journal
assert resp.text.count('Status1') == 2 # two in journal
assert resp.text.count('CSS-STATUS1') == 2
assert resp.text.count('new-evolution-1') == 1
assert resp.text.count('new-evolution-2') == 1

View File

@ -158,7 +158,6 @@ def test_i18n_form(pub, user, emails, http_requests):
)
assert resp.pyquery('.field-type-string .label').text() == 'champ texte'
assert resp.pyquery('.field-type-item .value').text() == 'deuxième'
assert resp.pyquery('.field.status .value').text() == 'Statut de workflow'
assert resp.pyquery('#evolutions li:first-child .status').text() == 'Statut de workflow'
assert resp.pyquery('form button').text() == 'Saut'
resp = resp.form.submit('button1', headers={'Accept-Language': 'fr'}).follow(

View File

@ -535,7 +535,7 @@ class FormStatusPage(Directory, FormTemplateMixin):
def should_fold_history(self):
return False
def receipt(self, always_include_user=False, show_status=True, form_url='', mine=True):
def receipt(self, always_include_user=False, form_url='', mine=True):
request_user = user = get_request().user
if not always_include_user and get_request().user and get_request().user.id == self.filled.user_id:
user = None
@ -545,18 +545,11 @@ class FormStatusPage(Directory, FormTemplateMixin):
except KeyError:
user = None
wf_status = None
if show_status and self.formdef.is_user_allowed_read_status_and_history(
get_request().user, self.filled
):
wf_status = self.filled.get_visible_status(user=get_request().user)
return template.render(
list(self.get_formdef_template_variants(self.summary_templates)),
{
'formdata': self.filled,
'should_fold_summary': self.should_fold_summary(mine, request_user),
'wf_status': wf_status,
'fields': self.display_fields(form_url=form_url),
'view': self,
'user': user,

View File

@ -15,11 +15,5 @@
{{ fields|safe }}
{% if wf_status %}
<div class="field status">
<p class="label">{% trans "Status "%}</p>
<span class="value">{{ wf_status.name|translate }}</span>
</div>
{% endif %}
</div> <!-- .dataview -->
</div> <!-- .section -->