From e32afd08fba6f15b7aac26e61491be5eb2890310 Mon Sep 17 00:00:00 2001 From: Nicolas Demonte Date: Wed, 13 Mar 2019 11:14:01 +0100 Subject: [PATCH] View history lines for cancellation of tasks or information #22006 --- src/pfwbged/policy/browser/history.py | 20 +++++++++++++++++++ .../locales/fr/LC_MESSAGES/pfwbged.policy.po | 4 ++++ src/pfwbged/policy/locales/pfwbged.policy.pot | 4 ++++ 3 files changed, 28 insertions(+) diff --git a/src/pfwbged/policy/browser/history.py b/src/pfwbged/policy/browser/history.py index 8624b2e..2d30f8b 100644 --- a/src/pfwbged/policy/browser/history.py +++ b/src/pfwbged/policy/browser/history.py @@ -47,6 +47,26 @@ class ContentHistoryView(BaseHistoryView): history_line['comments'] = _('To: ${to}', mapping={'to': history_line.get('to', '')}) history_line['transition_title'] = _('Sent version ${version} by email', mapping={'version': history_line.get('version', '?')}) + + # Task / Information creation and cancellation lines + if history_line['action_id'] == 'creation': + history_line['actor'] = None + history_line['actor_home'] = None + history_line['actorid'] = history_line['actor_name'] + history_line['type'] = 'creation' + history_line['action'] = 'creation' + history_line['transition_title'] = history_line['task_title'] + if history_line['action_id'] == 'cancellation': + history_line['actor'] = None + history_line['actor_home'] = None + history_line['actorid'] = history_line['actor_name'] + history_line['type'] = 'cancellation' + history_line['action'] = 'cancellation' + history_line['transition_title'] = _( + 'Cancelling ${task} for ${responsible}', + mapping={'task': history_line['task_title'], + 'responsible': history_line['responsible']}) + return history def workflowHistory(self, complete=True): diff --git a/src/pfwbged/policy/locales/fr/LC_MESSAGES/pfwbged.policy.po b/src/pfwbged/policy/locales/fr/LC_MESSAGES/pfwbged.policy.po index 749fc7c..a954d00 100644 --- a/src/pfwbged/policy/locales/fr/LC_MESSAGES/pfwbged.policy.po +++ b/src/pfwbged/policy/locales/fr/LC_MESSAGES/pfwbged.policy.po @@ -118,6 +118,10 @@ msgstr "Annuler la validation de la version ${version}" msgid "Cancel validation request" msgstr "Annuler la demande de validation" +#: ../browser/history.py:69 +msgid "Cancelling ${task} for ${responsible}" +msgstr "Annulation de ${task} pour ${responsible}" + #: ../browser/refuse.py:33 #: ../browser/send_by_email.py:35 #: ../browser/to_process.py:25 diff --git a/src/pfwbged/policy/locales/pfwbged.policy.pot b/src/pfwbged/policy/locales/pfwbged.policy.pot index 657fa1d..265c4aa 100644 --- a/src/pfwbged/policy/locales/pfwbged.policy.pot +++ b/src/pfwbged/policy/locales/pfwbged.policy.pot @@ -120,6 +120,10 @@ msgstr "" msgid "Cancel validation request" msgstr "" +#: ../browser/history.py:69 +msgid "Cancelling ${task} for ${responsible}" +msgstr "" + #: ../browser/refuse.py:33 #: ../browser/send_by_email.py:35 #: ../browser/to_process.py:25