fix for prism object panel header (error states were not computed cor…

…rectly)
Evolveum · May 21, 2014 · 51d94cb · 51d94cb
1 parent 80ba9bd
commit 51d94cb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java
@@ -186,9 +186,16 @@ private VisibleEnableBehaviour createFetchErrorVisibleBehaviour() {
             @Override
             public boolean isVisible() {
                 OperationResult fetchResult = getModelObject().getFetchResult();
+                if (fetchResult != null && !WebMiscUtil.isSuccessOrHandledError(fetchResult)) {
+                    return true;
+                }
+
                 OperationResult result = getModelObject().getResult();
-                return !WebMiscUtil.isSuccessOrHandledError(fetchResult)
-                        || !WebMiscUtil.isSuccessOrHandledError(result);
+                if (result != null && !WebMiscUtil.isSuccessOrHandledError(result)) {
+                    return true;
+                }
+
+                return false;
             }
         };
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java
@@ -97,9 +97,16 @@ private VisibleEnableBehaviour createFetchErrorVisibleBehaviour() {
             @Override
             public boolean isVisible() {
                 OperationResult fetchResult = getModelObject().getFetchResult();
+                if (fetchResult != null && !WebMiscUtil.isSuccessOrHandledError(fetchResult)) {
+                    return true;
+                }
+
                 OperationResult result = getModelObject().getResult();
-                return !WebMiscUtil.isSuccessOrHandledError(fetchResult)
-                        || !WebMiscUtil.isSuccessOrHandledError(result);
+                if (result != null && !WebMiscUtil.isSuccessOrHandledError(result)) {
+                    return true;
+                }
+
+                return false;
             }
         };
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
@@ -396,16 +396,18 @@ public Task createSimpleTask(String operation) {
     }
 
     public void showResult(OperationResult result) {
-        Validate.notNull(result, "Operation result must not be null.");
-        Validate.notNull(result.getStatus(), "Operation result status must not be null.");
+        if (result == null) {
+            return;
+        }
 
         OpResult opResult = new OpResult(result);
         showResult(opResult, false);
     }
 
     public void showResultInSession(OperationResult result) {
-        Validate.notNull(result, "Operation result must not be null.");
-        Validate.notNull(result.getStatus(), "Operation result status must not be null.");
+        if (result == null) {
+            return;
+        }
 
         OpResult opResult = new OpResult(result);
         showResult(opResult, true);