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

Fix possible NPE if applying filter before in was fully initialized #PL-4488

Browse Source
This commit is contained in:
Maxim Gorbunkov 2015-02-04 08:35:26 +00:00
parent 861222c45a
commit 2a025e7c07
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gui/src/com/haulmont/cuba/gui/components/filter/FilterDelegateImpl.java
View File

@ -1086,13 +1086,15 @@ public class FilterDelegateImpl implements FilterDelegate {
}
}
boolean haveRequiredConditions = haveFilledRequiredConditions();
if (!haveRequiredConditions) {
if (!isNewWindow) {
windowManager.showNotification(messages.getMainMessage("filter.emptyRequiredConditions"),
IFrame.NotificationType.HUMANIZED);
if (filterEntity != null) {
boolean haveRequiredConditions = haveFilledRequiredConditions();
if (!haveRequiredConditions) {
if (!isNewWindow) {
windowManager.showNotification(messages.getMainMessage("filter.emptyRequiredConditions"),
IFrame.NotificationType.HUMANIZED);
}
return false;
}
return false;
}
applyDatasourceFilter();