test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 19:57:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged from release_5_6 [from revision 22893]

Browse Source 
PL-5859 Enumeration field should be required in AttributeEditor
#PL-5859
This commit is contained in:
Eugeny Degtyarjov 2015-08-25 06:00:31 +00:00
parent 7394aac19c
commit 98858e8163
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/global/src/com/haulmont/cuba/core/entity/CategoryAttribute.java
View File

@ -263,7 +263,7 @@ public class CategoryAttribute extends StandardEntity {
Preconditions.checkState(getDataType() == PropertyType.ENUMERATION, "Only enumeration attributes have options");
String enumeration = getEnumeration();
String[] values = StringUtils.split(enumeration, ',');
return Arrays.asList(values);
return values != null ? Arrays.asList(values) : Collections.<String>emptyList();
}
public String getEntityClass() {

2
modules/gui/src/com/haulmont/cuba/gui/app/core/categories/attribute-edit.xml
View File

@ -33,7 +33,7 @@
<field id="lookup"/>
<field id="defaultEntityId" custom="true"/>
<field id="enumeration"/>
<field id="enumeration" required="true"/>
<field id="defaultString"/>
<field id="defaultInt"/>
<field id="defaultDouble"/>