fixing MID-3047 - Org. tree "plus" button .. implemented for both - o…

…rg members and role members.. fixing localization for popup
Evolveum · May 19, 2016 · a52192f · a52192f
1 parent a647712
commit a52192f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.java
@@ -32,7 +32,7 @@ private void initLayout(){
 	        type.setOutputMarkupId(true);
 	        add(type);
 
-	        AjaxButton confirmButton = new AjaxButton(ID_BUTTON_OK, createStringResource("button.ok")) {
+	        AjaxButton confirmButton = new AjaxButton(ID_BUTTON_OK, createStringResource("Button.ok")) {
 
 
 				@Override

diff --git a/...in/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java b/...in/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
@@ -148,7 +148,7 @@ protected void objectDetailsPerformed(AjaxRequestTarget target, ObjectType objec
 
 			@Override
 			protected void newObjectPerformed(AjaxRequestTarget target) {
-				// TODO Auto-generated method stub
+				AbstractRoleMemberPanel.this.createFocusMemberPerformed(null, target);
 
 			}
 

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
@@ -25,7 +25,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
@@ -85,7 +84,6 @@
 import com.evolveum.midpoint.web.page.admin.roles.component.RoleSummaryPanel;
 import com.evolveum.midpoint.web.session.UserProfileStorage.TableId;
 import com.evolveum.midpoint.web.util.StringResourceChoiceRenderer;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;