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

Merge from trunk 10723

Browse Source
This commit is contained in:
Yuriy Artamonov 2013-03-28 14:19:01 +00:00
parent 523f3e5364
commit 6c25132ba4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaDateFieldWrapper.java
View File

@ -89,10 +89,13 @@ public class CubaDateFieldWrapper extends CustomField {
@Override @Override
public void setPropertyDataSource(Property newDataSource) { public void setPropertyDataSource(Property newDataSource) {
Object newValue = newDataSource != null ? newDataSource.getValue() : null;
Object oldValue = getValue();
super.setPropertyDataSource(newDataSource); super.setPropertyDataSource(newDataSource);
// support dateField in editable table // support dateField in editable table
if (newDataSource != null && !ObjectUtils.equals(newDataSource.getValue(), getValue())) if (newDataSource != null && !ObjectUtils.equals(newValue, oldValue))
dateField.setValue(newDataSource.getValue()); dateField.setValue(newValue);
} }
@Override @Override
@ -107,4 +110,4 @@ public class CubaDateFieldWrapper extends CustomField {
@Override @Override
public void removeAllValidators() { public void removeAllValidators() {
} }
} }