Skip to content
Snippets Groups Projects
Commit 23e7e0ac authored by gpawel's avatar gpawel
Browse files

[LMS-2345] Empty hyperlink is rendered in correct way now

SVN: 21839
parent 6877fe76
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,7 @@ import com.google.gwt.user.client.ui.Anchor; ...@@ -33,6 +33,7 @@ import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Hyperlink; import com.google.gwt.user.client.ui.Hyperlink;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext.ClientStaticState; import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext.ClientStaticState;
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;
...@@ -158,7 +159,8 @@ public class LinkRenderer ...@@ -158,7 +159,8 @@ public class LinkRenderer
Grid<BaseEntityModel<?>> grid) Grid<BaseEntityModel<?>> grid)
{ {
String originalValue = String originalValue =
StringEscapeUtils.unescapeHtml(String.valueOf(model.get(property))); StringEscapeUtils.unescapeHtml(StringUtils.toStringEmptyIfNull(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