Skip to content
Snippets Groups Projects
Commit 35cb531d authored by felmer's avatar felmer
Browse files

LMS-1783 escape permlink field on server and unescape it in client

SVN: 19063
parent 048a7ddf
No related branches found
No related tags found
No related merge requests found
...@@ -227,8 +227,6 @@ class ReflectingStringEscaperUnrestricted<T> extends ReflectingStringEscaperImpl ...@@ -227,8 +227,6 @@ class ReflectingStringEscaperUnrestricted<T> extends ReflectingStringEscaperImpl
private Visitor() private Visitor()
{ {
unescapedProperties = new HashSet<String>(); unescapedProperties = new HashSet<String>();
// Don't escape these properties
unescapedProperties.add("permlink");
} }
public String tryVisit(String value, Object object, Field fieldOrNull) public String tryVisit(String value, Object object, Field fieldOrNull)
......
...@@ -35,6 +35,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonView ...@@ -35,6 +35,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonView
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel; import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.MultilineHTML; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.MultilineHTML;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.lang.StringEscapeUtils;
/** /**
* @author Franz-Josef Elmer * @author Franz-Josef Elmer
...@@ -111,7 +112,7 @@ public class LinkRenderer ...@@ -111,7 +112,7 @@ public class LinkRenderer
int rowIndex, int colIndex, ListStore<BaseEntityModel<?>> store, int rowIndex, int colIndex, ListStore<BaseEntityModel<?>> store,
Grid<BaseEntityModel<?>> grid) Grid<BaseEntityModel<?>> grid)
{ {
String originalValue = String.valueOf(model.get(property)); String originalValue = StringEscapeUtils.unescapeHtml(String.valueOf(model.get(property)));
String linkText = String linkText =
overridenLinkTextOrNull != null ? overridenLinkTextOrNull overridenLinkTextOrNull != null ? overridenLinkTextOrNull
: originalValue; : originalValue;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment