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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Krivopustov 2018-08-03 17:40:54 +04:00
commit 35869eef19
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/global/src/com/haulmont/cuba/bom.properties
View File

@ -93,15 +93,14 @@ org.javassist/javassist = 3.22.0-GA
org.hibernate/hibernate-validator = 5.4.2.Final
org.glassfish.web/javax.el = 2.2.6
com.vaadin = 8.4.5-1-cuba
com.vaadin = 8.5.1-0-cuba
com.vaadin/vaadin-server = ${com.vaadin}
com.vaadin/vaadin-client = ${com.vaadin}
com.vaadin/vaadin-client-compiler = ${com.vaadin}
com.vaadin/vaadin-themes = ${com.vaadin}
com.vaadin/vaadin-push = ${com.vaadin}
# for removal
com.vaadin/vaadin-compatibility-server = ${com.vaadin}
com.vaadin/vaadin-compatibility-themes = ${com.vaadin}
com.vaadin/vaadin-compatibility-client = ${com.vaadin}
org.springframework = 5.0.7.RELEASE

2
modules/web-widgets/src/com/haulmont/cuba/web/widgets/CubaColorPickerSelect.java
View File

@ -70,7 +70,7 @@ public class CubaColorPickerSelect extends ColorPickerSelect {
protected void updateSelectedItemCaption() {
if (range != null && range.getSelectedItem().isPresent()) {
range.updateSelectedItemCaption();
range.updateSelectedItemCaption(range.getSelectedItem().get());
}
}
}