You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/11/18 15:27:44 UTC
svn commit: r718610 - in
/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview:
ShowBean.java ShowList.java
Author: simoneg
Date: Tue Nov 18 06:27:43 2008
New Revision: 718610
URL: http://svn.apache.org/viewvc?rev=718610&view=rev
Log:
LABS-216 : escaping HTML in non rich-text fields output
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowBean.java
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowBean.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowBean.java?rev=718610&r1=718609&r2=718610&view=diff
==============================================================================
--- labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowBean.java (original)
+++ labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowBean.java Tue Nov 18 06:27:43 2008
@@ -32,6 +32,8 @@
import org.apache.magma.basics.MagmaException;
import org.apache.magma.beans.MagmaBeanSupport;
import org.apache.magma.beans.PropertyInfo;
+import org.apache.magma.validation.CompoundValidator;
+import org.apache.magma.validation.validators.RichTextValidator;
import org.apache.magma.view.Side;
import org.apache.magma.view.tree.ContainerProperty;
import org.apache.magma.view.tree.FieldNode;
@@ -251,7 +253,10 @@
String valueString = node.getProperty().toUser(value);
if (valueString != null && valueString.length() > 0) {
valueString = valueString.trim();
- valueString = StringEscapeUtils.escapeHtml(valueString);
+ CompoundValidator validators = node.getProperty().getValidator();
+ if (validators == null || validators.getValidator(RichTextValidator.class) == null) {
+ valueString = StringEscapeUtils.escapeHtml(valueString);
+ }
out.append(valueString);
}
}
Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java?rev=718610&r1=718609&r2=718610&view=diff
==============================================================================
--- labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java (original)
+++ labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java Tue Nov 18 06:27:43 2008
@@ -16,6 +16,7 @@
*/
package org.apache.magma.website.beansview;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.magma.basics.LocalizableString;
import org.apache.magma.basics.MagmaException;
import org.apache.magma.basics.utils.GenericClass;
@@ -24,6 +25,8 @@
import org.apache.magma.beans.MagmaBeanSupport;
import org.apache.magma.conversion.Converter;
import org.apache.magma.conversion.Converters;
+import org.apache.magma.validation.CompoundValidator;
+import org.apache.magma.validation.validators.RichTextValidator;
import org.apache.magma.view.tree.FieldNode;
import org.apache.magma.view.tree.Node;
import org.apache.magma.view.tree.ViewCustomizer;
@@ -149,6 +152,10 @@
Object value = ViewUtils.getNodeValue(fldn, bean);
String string = fldn.getProperty().toUser(value);
if (string != null) {
+ CompoundValidator validators = fldn.getProperty().getValidator();
+ if (validators == null || validators.getValidator(RichTextValidator.class) == null) {
+ string = StringEscapeUtils.escapeHtml(string);
+ }
tables.write(string);
}
if (this.linkUrl != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org