Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 15, 2017 · dd69cb9 · dd69cb9
2 parents 2e1d2e8 + cd7fef1
commit dd69cb9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
@@ -653,11 +653,10 @@ private IModel<String> getTargetUserLabelModel(){
         return new IModel<String>() {
             @Override
             public String getObject() {
-                List<PrismObject<UserType>> targetUsersList =  getRoleCatalogStorage().getTargetUserList();
-                if (targetUsersList == null ||
-                        targetUsersList.size() == 0){
+                if (getRoleCatalogStorage().isSelfRequest()){
                     return createStringResource("AssignmentCatalogPanel.requestForMe").getString();
                 }
+                List<PrismObject<UserType>> targetUsersList =  getRoleCatalogStorage().getTargetUserList();
                 if (targetUsersList.size() == 1){
                     return createStringResource("AssignmentCatalogPanel.requestFor").getString() +
                             " " + targetUsersList.get(0).getName().getOrig();
@@ -694,11 +693,10 @@ private boolean isAlreadyAssigned(PrismObject<AbstractRoleType> obj, AssignmentE
     }
 
     private PrismObject<UserType> getTargetUser(){
-        List<PrismObject<UserType>> targetUserList =  getRoleCatalogStorage().getTargetUserList();
-        if (targetUserList == null || targetUserList.size() == 0){
+        if (getRoleCatalogStorage().isSelfRequest()){
             return pageBase.loadUserSelf(pageBase);
         }
-        return targetUserList.get(0);
+        return getRoleCatalogStorage().getTargetUserList().get(0);
     }
 
     private AssignmentConstraintsType getAssignmentConstraints() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -442,8 +442,8 @@ private ObjectDelta prepareDelta(OperationResult result) {
                 FocusType.F_ASSIGNMENT, getPrismContext(), getAddAssignmentContainerValues(assignmentsModel.getObject()));
             if (!getSessionStorage().getRoleCatalog().isMultiUserRequest()) {
                 List<PrismObject<UserType>> usersList = getSessionStorage().getRoleCatalog().getTargetUserList();
-                PrismObject<UserType> user = usersList != null && usersList.size() > 0 ?
-                        usersList.get(0) : loadUserSelf(PageAssignmentsList.this);
+                PrismObject<UserType> user = getSessionStorage().getRoleCatalog().isSelfRequest() ?
+                        loadUserSelf(PageAssignmentsList.this) : usersList.get(0);
                 delta.addModificationDeleteContainer(FocusType.F_ASSIGNMENT,
                         getDeleteAssignmentContainerValues(user.asObjectable()));
             }
@@ -457,7 +457,8 @@ private ObjectDelta prepareDelta(OperationResult result) {
 
     private ObjectQuery getTaskQuery(){
         List<PrismObject<UserType>> userList = getSessionStorage().getRoleCatalog().getTargetUserList();
-        if (userList == null || userList.size() == 0){
+        if (getSessionStorage().getRoleCatalog().isSelfRequest()){
+            userList = new ArrayList<>();
             userList.add(loadUserSelf(PageAssignmentsList.this));
         }
         Set<String> oids = new HashSet<>();
@@ -525,8 +526,8 @@ private TextArea getDescriptionComponent(){
 
     private PrismObject<UserType> getTargetUser() throws SchemaException {
         List<PrismObject<UserType>> usersList = getSessionStorage().getRoleCatalog().getTargetUserList();
-        PrismObject<UserType> user = usersList != null && usersList.size() > 0 ?
-                usersList.get(0) : loadUserSelf(PageAssignmentsList.this);
+        PrismObject<UserType> user = getSessionStorage().getRoleCatalog().isSelfRequest() ?
+                loadUserSelf(PageAssignmentsList.this) : usersList.get(0);
         getPrismContext().adopt(user);
         return user;
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
@@ -188,6 +188,10 @@ public void setAssignmentsUserOwner(PrismObject<UserType> assignmentsUserOwner)
         this.assignmentsUserOwner = assignmentsUserOwner;
     }
 
+    public boolean isSelfRequest(){
+        return getTargetUserList() == null || getTargetUserList().size() == 0;
+    }
+
     public boolean isMultiUserRequest(){
         return getTargetUserList() != null && getTargetUserList().size() > 1;
     }

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3488,7 +3488,7 @@ AssignmentCatalogPanel.requestForMultiple={0} users selected
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
-MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.detailsLink=Properties
 MultiButtonPanel.addToCartLink=Add to cart
 MultiButtonPanel.alreadyAssignedIconTitle=Already assigned
 PageAssignmentDetails.title=Assignment details

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3445,7 +3445,7 @@ AssignmentCatalogPanel.requestForMultiple={0} users selected
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
-MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.detailsLink=Properties
 MultiButtonPanel.addToCartLink=Add to cart
 MultiButtonPanel.alreadyAssignedIconTitle=Already assigned
 PageAssignmentDetails.title=Assignment details