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

Removing null action throws exception for WebPickerField #PL-4814

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-02-09 15:19:17 +00:00
parent a3534674c5
commit 9d09791d9a
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/web/src/com/haulmont/cuba/web/gui/components/WebPickerField.java
View File

@ -282,11 +282,13 @@ public class WebPickerField extends WebAbstractField<CubaPickerField> implements
@Override
public void removeAction(Action action) {
actions.remove(action);
actionHandler.removeAction(action);
if (action.getOwner() != null && action.getOwner() instanceof WebButton) {
Button button = ((WebButton) action.getOwner()).getComponent();
component.removeButton(button);
if (action != null) {
actions.remove(action);
actionHandler.removeAction(action);
if (action.getOwner() != null && action.getOwner() instanceof WebButton) {
Button button = ((WebButton) action.getOwner()).getComponent();
component.removeButton(button);
}
}
}

12
modules/web6/src/com/haulmont/cuba/web/gui/components/WebPickerField.java
View File

@ -351,11 +351,13 @@ public class WebPickerField
@Override
public void removeAction(Action action) {
actions.remove(action);
actionHandler.removeAction(action);
if (action.getOwner() != null && action.getOwner() instanceof WebButton) {
Button button = ((WebButton) action.getOwner()).getComponent();
component.removeButton(button);
if (action != null) {
actions.remove(action);
actionHandler.removeAction(action);
if (action.getOwner() != null && action.getOwner() instanceof WebButton) {
Button button = ((WebButton) action.getOwner()).getComponent();
component.removeButton(button);
}
}
}