Merge branch 'master' into feature/bean-schema-aware

Evolveum · Mar 1, 2021 · b82834b · b82834b
2 parents aff2a02 + 268cf1d
commit b82834b
Show file tree

Hide file tree

Showing 76 changed files with 1,465 additions and 2,981 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/BasicInfoBoxPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/BasicInfoBoxPanel.java
@@ -47,7 +47,7 @@ protected void customInitLayout(WebMarkupContainer parentInfoBox, IModel<InfoBox
 
             @Override
             public boolean isVisible() {
-                return model.getObject().getProgress() != null;
+                return model.getObject() != null && model.getObject().getProgress() != null;
             }
         });
         ProgressbarPanel progressBar = new ProgressbarPanel(ID_PROGRESS_BAR, new PropertyModel<>(model, InfoBoxType.PROGRESS));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.java
@@ -18,7 +18,7 @@
  * @author katkav
  * @author semancik
  */
-public abstract class InfoBoxPanel extends Panel{
+public abstract class InfoBoxPanel extends Panel {
     private static final long serialVersionUID = 1L;
 
     private static final String ID_INFO_BOX = "infoBox";

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxType.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Evolveum and contributors
+ * Copyright (c) 2016-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -12,7 +12,7 @@
  * @author katkav
  * @author semancik
  */
-public class InfoBoxType implements Serializable{
+public class InfoBoxType implements Serializable {
     private static final long serialVersionUID = 1L;
 
     public static final String ICON_BACKGROUND_COLOR = "iconBackgroundColor";