password panel fix

Evolveum · Jul 25, 2017 · c2a693e · c2a693e
1 parent ce52075
commit c2a693e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
@@ -180,8 +180,8 @@ public boolean isVisible() {
                 if (pageBase instanceof PageSelfProfile){
                     return false;
                 }
-                if (pageBase instanceof PageUser
-                        && model.getObject() != null && !model.getObject().isEmpty()){
+                if (pageBase instanceof PageUser && !((PageUser) pageBase).isLoggedInUserPage()
+                        && model.getObject() != null){
                     return true;
                 }
                 return false;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.util.FocusTabVisibleBehavior;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.model.api.ModelAuthorizationAction;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
@@ -365,4 +366,10 @@ private void saveDelegationToUser(UserType user, List<AssignmentEditorDto> assig
         showResult(result);
     }
 
+    public boolean isLoggedInUserPage(){
+        return getObjectWrapper() != null && getObjectWrapper().getObject() != null &&
+                StringUtils.isNotEmpty(getObjectWrapper().getObject().asObjectable().getOid()) &&
+                getObjectWrapper().getObject().asObjectable().getOid().equals(WebModelServiceUtils.getLoggedInUserOid());
+    }
+
 }