some code refactoring for UserMenuPanel

Evolveum · Nov 17, 2015 · b9e7f40 · b9e7f40
1 parent 90ce800
commit b9e7f40
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
@@ -87,12 +87,10 @@ public class UserMenuPanel extends BaseSimplePanel {
 
     private boolean isUserModelLoaded = false;
     private boolean isPasswordModelLoaded = false;
+    private  byte[] jpegPhoto = null;
 
     public UserMenuPanel(String id) {
         super(id);
-//        if (!isUserModelLoaded) {
-//            loadModel();
-//        }
         if (!isPasswordModelLoaded) {
             passwordQuestionsDtoIModel = new LoadableModel<PasswordQuestionsDto>(false) {
 
@@ -103,20 +101,22 @@ protected PasswordQuestionsDto load() {
                     return loadModel();
                 }
             };
-//            isPasswordModelLoaded = true;
+            isPasswordModelLoaded = true;
         }
     }
 
     @Override
     protected void initLayout() {
+        if (userModel != null && userModel.getObject() == null){
+            loadModel();
+        }
         WebMarkupContainer iconBox = new WebMarkupContainer(ID_ICON_BOX);
         add(iconBox);
 
         Image img = new Image(ID_PHOTO, new AbstractReadOnlyModel<AbstractResource>() {
 
             @Override
             public AbstractResource getObject() {
-                byte[] jpegPhoto = userModel.getObject().asObjectable().getJpegPhoto();
                 if(jpegPhoto == null) {
                     return null;
                 } else {
@@ -127,13 +127,10 @@ public AbstractResource getObject() {
         img.add(new VisibleEnableBehaviour(){
             @Override
             public boolean isVisible(){
-                byte [] photo = null;
                 if (userModel != null && userModel.getObject() == null){
                     loadModel();
-                    photo = userModel.getObject().asObjectable().getJpegPhoto();
                 }
-                return userModel == null ? false :
-                        (userModel.getObject() == null ? false : photo != null);
+                return jpegPhoto != null;
             }
         });
         iconBox.add(img);
@@ -146,8 +143,7 @@ public boolean isVisible(){
                 if (userModel != null && userModel.getObject() == null){
                     loadModel();
                 }
-                return userModel == null ? false :
-                        (userModel.getObject() == null ? false : userModel.getObject().asObjectable().getJpegPhoto() == null);
+                return jpegPhoto == null;
 
 
             }
@@ -175,7 +171,6 @@ public String getObject() {
 
             @Override
             public AbstractResource getObject() {
-                byte[] jpegPhoto = userModel.getObject().asObjectable().getJpegPhoto();
                 if(jpegPhoto == null) {
                     return null;
                 } else {
@@ -189,8 +184,7 @@ public boolean isVisible(){
                 if (userModel != null && userModel.getObject() == null){
                     loadModel();
                 }
-                return userModel == null ? false :
-                        (userModel.getObject() == null ? false : userModel.getObject().asObjectable().getJpegPhoto() != null);
+                return jpegPhoto != null;
             }
         });
         panelIconBox.add(panelImg);
@@ -203,8 +197,7 @@ public boolean isVisible(){
                 if (userModel != null && userModel.getObject() == null){
                     loadModel();
                 }
-                return userModel == null ? false :
-                        (userModel.getObject() == null ? false : userModel.getObject().asObjectable().getJpegPhoto() == null);
+                return jpegPhoto == null;
             }
         });
         panelIconBox.add(panelIcon);
@@ -296,7 +289,8 @@ private PasswordQuestionsDto loadModel() {
                     GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE));
             PrismObject<UserType> user = ((PageBase)getPage()).getModelService().getObject(UserType.class, userOid, options, task, subResult);
             userModel.setObject(user);
-
+            jpegPhoto = user == null ? null :
+                    (user.asObjectable() == null ? null : user.asObjectable().getJpegPhoto());
             dto.setSecurityAnswers(createUsersSecurityQuestionsList(user));
 
             subResult.recordSuccessIfUnknown();