improvements role catalog

Evolveum · Mar 21, 2017 · 34df7cd · 34df7cd
1 parent 33ea9a2
commit 34df7cd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 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
@@ -642,7 +642,9 @@ protected void onSelectPerformed(AjaxRequestTarget target, UserType targetUser)
                 super.onSelectPerformed(target, targetUser);
                 if (targetUserSelection) {
                     pageBase.getSessionStorage().getRoleCatalog().setTargetUser(targetUser.asPrismContainer());
-                    target.add(getTargetUserContainer());
+                    AssignmentCatalogPanel.this.addOrReplaceLayout(target, getCatalogItemsPanelContainer());
+                    target.add(getHeaderPanel());
+                    target.add(getCatalogItemsPanelContainer());
                 } else {
                     pageBase.getSessionStorage().getRoleCatalog().setAssignmentsUserOwner(targetUser.asPrismContainer());
                     AssignmentCatalogPanel.this.addOrReplaceLayout(target, getCatalogItemsPanelContainer());

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
@@ -22,6 +22,7 @@
     <form wicket:id="mainForm" class="form-horizontal">
         <div wicket:id="assignmentTablePanel"/>
         <wicket:child />
+        <h4><wicket:message key="PageAssignmentsList.requestComment" /></h4>
         <textarea class="form-control input-sm" rows="2"
                   wicket:id="description"
                   wicket:message="placeholder:PageAssignmentsList.commentHere" style="width: 50%; margin-bottom: 10px;"></textarea>

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3405,8 +3405,8 @@ PageAssignmentConflicts.back=Back
 PageAssignmentConflicts.submit=Submit
 AssignmentCatalogPanel.selectTargetUser=Select target user
 AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
-AssignmentCatalogPanel.requestForMe=Request for me
-AssignmentCatalogPanel.requestFor=Request for
+AssignmentCatalogPanel.requestForMe=Target user: me
+AssignmentCatalogPanel.requestFor=Target user:
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
@@ -3418,6 +3418,7 @@ PageAssignmentDetails.addToCartButton=Add to cart
 PageAssignmentsList.submitButton=Submit
 PageAssignmentsList.resolveConflicts=Resolve conflicts
 PageAssignmentsList.commentHere=Comment here...
+PageAssignmentsList.requestComment=Request comment (optional)
 AssignmentShoppingCartPanel.treeTitle=Role catalog
 AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3361,8 +3361,8 @@ PageAssignmentConflicts.back=Back
 PageAssignmentConflicts.submit=Submit
 AssignmentCatalogPanel.selectTargetUser=Select target user
 AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
-AssignmentCatalogPanel.requestForMe=Request for me
-AssignmentCatalogPanel.requestFor=Request for
+AssignmentCatalogPanel.requestForMe=Target user: me
+AssignmentCatalogPanel.requestFor=Target user:
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details