Fixed NPE in GUI (non-recomputed users)

Evolveum · Jan 24, 2017 · 62a623c · 62a623c
1 parent 2b62c2e
commit 62a623c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java b/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
@@ -156,12 +156,12 @@ public boolean isButtonVisible(int id, IModel<T> model) {
                 model.getObject() instanceof SelectableBean &&
                 ((SelectableBean) model.getObject()).getValue() instanceof FocusType){
             FocusType focus = (FocusType)((SelectableBean) model.getObject()).getValue();
-            return ActivationStatusType.DISABLED.equals(focus.getActivation().getAdministrativeStatus());
+            return focus.getActivation() != null && ActivationStatusType.DISABLED.equals(focus.getActivation().getAdministrativeStatus());
         } else if (id == InlineMenuItem.INLINE_MENU_ITEM_ID.DISABLE.getMenuItemId() &&
                 model.getObject() instanceof SelectableBean &&
                 ((SelectableBean) model.getObject()).getValue() instanceof FocusType){
             FocusType focus = (FocusType)((SelectableBean) model.getObject()).getValue();
-            return !ActivationStatusType.DISABLED.equals(focus.getActivation().getAdministrativeStatus());
+            return focus.getActivation() == null || !ActivationStatusType.DISABLED.equals(focus.getActivation().getAdministrativeStatus());
         }
         return true;
     }