test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-1202 Разработать механизм работы с динамическими атрибутами

Browse Source 
support required attributes
#PL-1202
This commit is contained in:
Eugeny Degtyarjov 2015-04-24 13:49:55 +00:00
parent 12bd06bf57
commit d8a1c18f47
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/global/src/com/haulmont/cuba/core/app/dynamicattributes/DynamicAttributesMetaProperty.java
View File

@ -31,6 +31,7 @@ public class DynamicAttributesMetaProperty extends MetadataObjectImpl implements
private MetaClass metaClass; private MetaClass metaClass;
private transient Range range; private transient Range range;
private Class javaClass; private Class javaClass;
private Boolean mandatory;
private AnnotatedElement annotatedElement = new FakeAnnotatedElement(); private AnnotatedElement annotatedElement = new FakeAnnotatedElement();
@ -38,6 +39,7 @@ public class DynamicAttributesMetaProperty extends MetadataObjectImpl implements
this.javaClass = DynamicAttributesUtils.getAttributeClass(attribute); this.javaClass = DynamicAttributesUtils.getAttributeClass(attribute);
this.metaClass = metaClass; this.metaClass = metaClass;
this.name = DynamicAttributesUtils.encodeAttributeCode(attribute.getCode()); this.name = DynamicAttributesUtils.encodeAttributeCode(attribute.getCode());
this.mandatory = attribute.getRequired();
Metadata metadata = AppBeans.get(Metadata.NAME); Metadata metadata = AppBeans.get(Metadata.NAME);
Session metadataSession = metadata.getSession(); Session metadataSession = metadata.getSession();
if (SetValueEntity.class.isAssignableFrom(javaClass)) { if (SetValueEntity.class.isAssignableFrom(javaClass)) {
@ -72,7 +74,7 @@ public class DynamicAttributesMetaProperty extends MetadataObjectImpl implements
@Override @Override
public boolean isMandatory() { public boolean isMandatory() {
return false; return Boolean.TRUE.equals(mandatory);
} }
@Override @Override

1
modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/FieldGroupLoader.java
View File

@ -186,6 +186,7 @@ public class FieldGroupLoader extends AbstractFieldLoader {
field.setType(metaPropertyPath.getRangeJavaClass()); field.setType(metaPropertyPath.getRangeJavaClass());
field.setCaption(attribute.getName()); field.setCaption(attribute.getName());
field.setDatasource(ds); field.setDatasource(ds);
field.setRequired(attribute.getRequired());
if (fieldGroup.getWidth() > 0) { if (fieldGroup.getWidth() > 0) {
field.setWidth("100%"); field.setWidth("100%");

1
modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractField.java
View File

@ -18,7 +18,6 @@ import com.haulmont.cuba.gui.components.ValidationException;
import com.haulmont.cuba.gui.data.Datasource; import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.ValueChangingListener; import com.haulmont.cuba.gui.data.ValueChangingListener;
import com.haulmont.cuba.gui.data.ValueListener; import com.haulmont.cuba.gui.data.ValueListener;
import com.haulmont.cuba.gui.dynamicattributes.DynamicAttributesGuiTools;
import com.haulmont.cuba.web.gui.data.ItemWrapper; import com.haulmont.cuba.web.gui.data.ItemWrapper;
import com.vaadin.data.Property; import com.vaadin.data.Property;
import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractComponent;