[syncope] branch master updated: [SYNCOPE-1606] Fix user toggle panel

[mdisabatino]

This is an automated email from the ASF dual-hosted git repository.

mdisabatino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 1509416  [SYNCOPE-1606] Fix user toggle panel
1509416 is described below

commit 15094166cffac64ab1f1609a83569f8fba6f6f40
Author: Marco Di Sabatino Di Diodoro <marco.disabat...@tirasa.net>
AuthorDate: Tue Dec 22 16:55:08 2020 +0100

    [SYNCOPE-1606] Fix user toggle panel
---
 .../syncope/client/console/panels/UserDirectoryPanel.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index fcce6d5..6b97bce 100644
--- 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++ 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -81,7 +81,7 @@ public class UserDirectoryPanel extends 
AnyDirectoryPanel<UserTO, UserRestClient
                 modal.show(false);
             }
         });
-    }
+            }
 
     @Override
     protected String paginatorRowsKey() {
@@ -155,6 +155,7 @@ public class UserDirectoryPanel extends 
AnyDirectoryPanel<UserTO, UserRestClient
             @Override
             public void onClick(final AjaxRequestTarget target, final UserTO 
ignore) {
                 try {
+                    
model.setObject(restClient.read(model.getObject().getKey()));
                     restClient.mustChangePassword(
                             model.getObject().getETagValue(),
                             !model.getObject().isMustChangePassword(),
@@ -178,6 +179,7 @@ public class UserDirectoryPanel extends 
AnyDirectoryPanel<UserTO, UserRestClient
 
                 @Override
                 public void onClick(final AjaxRequestTarget target, final 
UserTO ignore) {
+                    
model.setObject(restClient.read(model.getObject().getKey()));
                     IModel<AnyWrapper<UserTO>> formModel = new 
CompoundPropertyModel<>(
                             new AnyWrapper<>(model.getObject()));
                     displayAttributeModal.setFormModel(formModel);
@@ -223,7 +225,7 @@ public class UserDirectoryPanel extends 
AnyDirectoryPanel<UserTO, UserRestClient
             
SyncopeWebApplication.get().getAnyDirectoryPanelAdditionalActionLinksProvider().get(
                     model,
                     realm,
-                    altDefaultModal,
+                            altDefaultModal,
                     getString("any.edit", new Model<>(new 
AnyWrapper<>(model.getObject()))),
                     this,
                     pageRef).forEach(panel::add);
@@ -255,10 +257,10 @@ public class UserDirectoryPanel extends 
AnyDirectoryPanel<UserTO, UserRestClient
                     target.add(utilityModal);
                 }
             }, ActionType.NOTIFICATION_TASKS, IdRepoEntitlement.TASK_LIST);
-        }
+                }
 
-        if (wizardInModal) {
-            panel.add(new ActionLink<UserTO>() {
+            if (wizardInModal) {
+                panel.add(new ActionLink<UserTO>() {
 
                 private static final long serialVersionUID = 
-1978723352517770644L;