Author: ymartel Date: 2012-05-31 10:12:17 +0200 (Thu, 31 May 2012) New Revision: 164 Url: http://chorem.org/repositories/revision/chorem/164 Log: use a SELECT multiple for collection String with allowed Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-29 10:05:00 UTC (rev 163) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-31 08:12:17 UTC (rev 164) @@ -95,10 +95,10 @@ inputNumeric(output, contextPath, name, wikitty, field, extName, fieldName); break; case STRING: - if (field.isCollection()) { + if (field.hasAllowed()) { + inputSelectString(output, contextPath, name, wikitty, field, extName, fieldName); + } else if (field.isCollection()){ inputCollectionString(output, contextPath, name, wikitty, field, extName, fieldName); - } else if (field.hasAllowed()){ - inputSelectString(output, contextPath, name, wikitty, field, extName, fieldName); } else { inputString(output, contextPath, name, wikitty, field, extName, fieldName); } @@ -192,7 +192,11 @@ throws JspException, IOException { String id = wikitty.getId() + "-" + extName + "-" + fieldName; String value = wikitty.getFieldAsString(extName, fieldName); - /*{<select id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%> >}*/ + /*{<select id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%> }*/ + if (field.isCollection()) { + /*{ multiple="multiple" }*/ + } + /*{ >}*/ List<String> allowedValues = field.getAllowedAsList(); for (String allowedValue : allowedValues) { /*{<option value="<%=allowedValue%>"<%=getDynamicAttribute()%> ><%=allowedValue%></option>}*/