MID-9112:fix for NPE

Evolveum · Sep 21, 2023 · e85262f · e85262f
1 parent 7cc3739
commit e85262f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/...pl/page/admin/resource/component/wizard/objectType/activation/ActivationsWizardPanel.java b/...pl/page/admin/resource/component/wizard/objectType/activation/ActivationsWizardPanel.java
@@ -95,6 +95,7 @@ private List<WizardStep> createPredefinedMappingSteps(
         steps.add(new PredefinedMappingStepPanel(getAssignmentHolderModel(), valueModel) {
             @Override
             protected void onExitPerformed(AjaxRequestTarget target) {
+                WebComponentUtil.showToastForRecordedButUnsavedChanges(target, valueModel.getObject());
                 showActivationTablePanel(target, direction);
             }
         });

diff --git a/...age/admin/resource/component/wizard/objectType/activation/PredefinedMappingStepPanel.java b/...age/admin/resource/component/wizard/objectType/activation/PredefinedMappingStepPanel.java
@@ -62,7 +62,7 @@ protected IModel<?> getSubTextModel() {
 
     @Override
     protected boolean isSubmitVisible() {
-        return false;
+        return true;
     }
 
     @Override
@@ -72,7 +72,7 @@ protected boolean isExitButtonVisible() {
 
     @Override
     public VisibleEnableBehaviour getBackBehaviour() {
-        return VisibleBehaviour.ALWAYS_VISIBLE_ENABLED;
+        return VisibleBehaviour.ALWAYS_INVISIBLE;
     }
 
     @Override
@@ -85,12 +85,6 @@ public VisibleEnableBehaviour getNextBehaviour() {
         return VisibleBehaviour.ALWAYS_INVISIBLE;
     }
 
-    @Override
-    public boolean onBackPerformed(AjaxRequestTarget target) {
-        onExitPerformed(target);
-        return false;
-    }
-
     @Override
     protected ItemVisibilityHandler getVisibilityHandler() {
         return wrapper -> {

diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/input/DurationWithOneElementPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/input/DurationWithOneElementPanel.java
@@ -206,6 +206,9 @@ public String convertToString(Duration duration, Locale locale) {
         }
 
         private String convertToString(Duration duration, DatatypeConstants.Field unit) {
+            if (duration == null) {
+                return null;
+            }
             List<DatatypeConstants.Field> choices = getChoicesAsField();
 
             Optional<DatatypeConstants.Field> field = choices