Skip to content
Snippets Groups Projects
Commit e598b254 authored by srosse's avatar srosse
Browse files

OO-4015: fix generic selection rendering

parent b3477a3f
No related branches found
No related tags found
No related merge requests found
...@@ -207,6 +207,11 @@ public class GenericSelectionPropertyHandler extends AbstractUserPropertyHandler ...@@ -207,6 +207,11 @@ public class GenericSelectionPropertyHandler extends AbstractUserPropertyHandler
return (value == null ? NO_SEL_KEY : value); return (value == null ? NO_SEL_KEY : value);
} }
@Override
public String getUserProperty(User user, Locale locale) {
return getUserPropertyAsHTML(user, locale);
}
@Override @Override
public void updateUserFromFormItem(User user, FormItem formItem) { public void updateUserFromFormItem(User user, FormItem formItem) {
String internalValue = getStringValue(formItem); String internalValue = getStringValue(formItem);
...@@ -287,17 +292,15 @@ public class GenericSelectionPropertyHandler extends AbstractUserPropertyHandler ...@@ -287,17 +292,15 @@ public class GenericSelectionPropertyHandler extends AbstractUserPropertyHandler
@Override @Override
public String getUserPropertyAsHTML(User user, Locale locale) { public String getUserPropertyAsHTML(User user, Locale locale) {
String val = super.getInternalValue(user);// don't want "no selection" key
StringBuilder htmlValue = new StringBuilder(); StringBuilder htmlValue = new StringBuilder();
Translator trans = Util.createPackageTranslator(this.getClass(), locale); Translator trans = Util.createPackageTranslator(this.getClass(), locale);
if (isMultiSelect()) { if (isMultiSelect()) {
for (String value : getInternalValue(user).split(KEY_DELIMITER)) { for (String value : val.split(KEY_DELIMITER)) {
htmlValue.append(trans.translate(value)).append(" "); htmlValue.append(trans.translate(value)).append(" ");
} }
} else { } else if(val != null && locale != null) {
String val = getInternalValue(user); htmlValue.append(trans.translate(val));
if(val != null && locale != null) {
htmlValue.append(trans.translate(val));
}
} }
return htmlValue.toString(); return htmlValue.toString();
} }
......
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