Merge remote-tracking branch 'origin/master'

Evolveum · Oct 3, 2023 · 32b0852 · 32b0852
2 parents a3978f0 + 34e1781
commit 32b0852
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/...veum/midpoint/gui/impl/page/admin/role/component/wizard/GovernanceMembersWizardPanel.java b/...veum/midpoint/gui/impl/page/admin/role/component/wizard/GovernanceMembersWizardPanel.java
@@ -155,4 +155,18 @@ protected IModel<String> getSubTextModel() {
     protected String getCssForWidthOfFeedbackPanel() {
         return "col-11";
     }
+
+    @Override
+    protected boolean isExitButtonVisible() {
+        return false;
+    }
+
+    @Override
+    protected boolean isBackButtonVisible() {
+        return true;
+    }
+
+    protected IModel<String> getExitLabel() {
+        return getPageBase().createStringResource("PageBase.button.back");
+    }
 }
diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/MembersWizardPanel.java b/...a/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/MembersWizardPanel.java
@@ -163,4 +163,18 @@ protected IModel<String> getSubTextModel() {
     protected String getCssForWidthOfFeedbackPanel() {
         return "col-11";
     }
+
+    @Override
+    protected boolean isExitButtonVisible() {
+        return false;
+    }
+
+    @Override
+    protected boolean isBackButtonVisible() {
+        return true;
+    }
+
+    protected IModel<String> getExitLabel() {
+        return getPageBase().createStringResource("PageBase.button.back");
+    }
 }
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/self/credentials/PropagatePasswordPanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/page/self/credentials/PropagatePasswordPanel.java
@@ -537,6 +537,8 @@ private List<StringLimitationResult> getLimitationsForActualPassword(ValuePolicy
 
     protected void collectDeltas(Collection<ObjectDelta<? extends ObjectType>> deltas, ProtectedStringType currentPassword, ItemPath valuePath) {
         List<PasswordAccountDto> selectedAccounts = Lists.newArrayList(provider.internalIterator(0, provider.size()));
+        selectedAccounts.removeIf(account -> !account.isSelected());
+
         SchemaRegistry registry = getPrismContext().getSchemaRegistry();
         selectedAccounts.forEach(account -> {
             PrismObjectDefinition objDef = account.isMidpoint() ?