From 0e2352aa79aa2eb4cd43a745548dab8f19eef7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 10 Nov 2015 14:00:59 +0000
Subject: [PATCH] equivalence tester: quick hacks for better display of
divergences
---
product/ERP5/mixin/equivalence_tester.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/product/ERP5/mixin/equivalence_tester.py b/product/ERP5/mixin/equivalence_tester.py
index 6ef0c3c691..f36b67aa32 100644
--- a/product/ERP5/mixin/equivalence_tester.py
+++ b/product/ERP5/mixin/equivalence_tester.py
@@ -86,6 +86,7 @@ class EquivalenceTesterMixin:
decision_value=decision_value,
prevision_value=prevision_value,
tested_property=self.getTestedProperty(),
+ tested_property_title=self.getTestedPropertyTitle(),
tester_relative_url=self.getRelativeUrl(),
message=message,
mapping=mapping
@@ -173,15 +174,15 @@ class EquivalenceTesterMixin:
return None
# XXX explanation message should be provided by each class, each
# portal type or each document.
- message = '<a href="${decision_url}">${property_name} of ${decision_value} of ${decision_type} ${decision_title}</a> of <a href="${delivery_url}">${delivery_title}</a> is different from <a href="${prevision_url}">planned ${property_name} of ${prevision_value}</a>.'
+ message = '<a href="${decision_url}">${property_name} of ${decision_value} of ${decision_type} ${decision_title}</a><br/>' \
+ 'of <a href="${delivery_url}">${delivery_title}</a><br/>' \
+ 'is different from <a href="${prevision_url}">planned ${property_name} of ${prevision_value}</a>.'
decision_movement = self.getPortalObject().unrestrictedTraverse(
divergence_message.getProperty('object_relative_url'))
decision_delivery = decision_movement.getRootDeliveryValue()
mapping = {
'decision_url':decision_movement.absolute_url(),
- # TODO we need a way to map the property name to the business word,
- # eg. 'start_date' to 'Delivery Date' for trade etc.
- 'property_name':divergence_message.getProperty('tested_property'),
+ 'property_name':divergence_message.getProperty('tested_property_title') or divergence_message.getProperty('tested_property'),
'decision_value':h(divergence_message.getProperty('decision_value')),
'decision_type':decision_movement.getPortalType(),
'decision_title':h(decision_movement.getTitleOrId()),
--
GitLab