From 3bed045dbf07ec374ea537bb91bd8404c2fc97e7 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 25 Nov 2009 08:27:51 +0000
Subject: [PATCH] [LMS-1264] added unescaping property values for sample
notifications; skipped information about tracked data sets if no data sets
were created
SVN: 13523
---
.../dsu/tracking/email/EntityTrackingEmailGenerator.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java
index 2a0b97a631f..14d26904450 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackedEntities;
import ch.ethz.bsse.cisd.dsu.tracking.email.EntityTrackingEmailData.SequencingSampleData;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.lang.StringEscapeUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
@@ -206,6 +207,10 @@ public class EntityTrackingEmailGenerator implements IEntityTrackingEmailGenerat
private static void appendDataSetsData(StringBuilder sb, List<ExternalData> dataSets)
{
+ if (dataSets.isEmpty())
+ {
+ return;
+ }
appendln(sb, SECTION_SEPARATOR_LINE);
appendln(sb, SUBSECTION_SEPARATOR_LINE);
appendln(sb, String.format(
@@ -250,7 +255,7 @@ public class EntityTrackingEmailGenerator implements IEntityTrackingEmailGenerat
for (IEntityProperty property : properties)
{
final String label = property.getPropertyType().getLabel();
- final String value = property.getValue();
+ final String value = StringEscapeUtils.unescapeHtml(property.getValue());
appendAttribute(sb, label, value);
}
}
--
GitLab