org managers operations..

Evolveum · Apr 20, 2016 · a4568bb · a4568bb
1 parent d00ee67
commit a4568bb
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 99 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
@@ -16,24 +16,8 @@
   ~ limitations under the License.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-<!--     <div wicket:id="confirmDeletePopup" /> -->
-<!--     <div wicket:id="movePopup" /> -->
-<!--     <div wicket:id="addDeletePopup" /> -->
 
-    <!-- todo fix styles for all header with cog, it must be unified somehow !!!! [lazyman] -->
-<!--     <div class="row"> -->
-<!--         <div class="col-md-12 clearfix"> -->
-<!--             <form class="form-inline pull-right search-form" wicket:id="searchForm"> -->
-<!-- 	            <div class="form-group"> -->
-<!-- 	                <select class="form-control input-sm" wicket:id="searchScope"/> -->
-<!-- 	                <select class="form-control input-sm" wicket:id="searchByType"/> -->
-<!-- 	            </div> -->
-<!--                 <div wicket:id="basicSearch"/> -->
-<!--             </form> -->
-<!--         </div> -->
-        <div > <!-- class="col-md-4" -->
-<!--             <div class="box box-default"> -->
-<!--                 <div class="box-body"> -->
+        <div >
                     <div wicket:id="treeHeader" class="row" style="margin: 0; border-bottom: 1px solid #ddd;">
                         <div class="col-xs-9" style="padding-left: 5px;"> <!-- class="col-xs-9" style="padding-left: 5px;" -->
                             <div class="tree-table-header">
@@ -46,44 +30,7 @@
                     <div wicket:id="treeContainer" class="org-tree-container">
                         <div wicket:id="tree"/>
                     </div>
-<!--                 </div> -->
-<!--             </div> -->
-        </div>
-<!--         <div class="col-md-8"> -->
-<!--             <div class="box box-success"> -->
-<!--                 <div class="box-body"> -->
-<!--                     <form class="clearfix form-horizontal" wicket:id="form"> -->
-<!-- <!--                         <div wicket:id="childOrgContainer"> --> 
-<!-- <!--                             <div class="tree-table-header"> --> 
-<!-- <!--                                 <wicket:message key="TreeTablePanel.childOrg"/> --> 
-<!-- <!--                             </div> --> 
-<!-- <!--                             <div wicket:id="childUnitTable" about="childUnitTable"/> --> 
-<!-- <!--                         </div> --> 
-
-<!--                         <div wicket:id="managerContainer"> -->
-<!--                         <div class="tree-table-header"> -->
-<!--                                 <wicket:message key="TreeTablePanel.managers"/> -->
-<!--                             </div> -->
-<!--                             <div class="col-md-12" wicket:id="managerTable"> -->
-<!--                             <div class="pull-right"> -->
-<!--                             	<div wicket:id="editManager" class="fa fa-edit"></div> -->
-<!--                             	<div wicket:id="removeManager" class="fa fa-trash-o"></div> -->
-<!--                             	</div> -->
-<!--                             	<div wicket:id="managerSummary" ></div> -->
-
-<!--                             </div> -->
-<!--                         </div> -->
 
-<!--                         <div wicket:id="memberContainer"> -->
-<!--                             <div class="tree-table-header"> -->
-<!--                                 <wicket:message key="TreeTablePanel.members"/> -->
-<!--                             </div> -->
-<!--                             <div wicket:id="memberTable"/> -->
-<!--                         </div> -->
+        </div>
 
-<!--                     </form> -->
-<!--                 </div> -->
-<!--             </div> -->
-<!--         </div> -->
-<!--     </div> -->
 </wicket:panel>
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
@@ -202,15 +202,7 @@ public void onClick(AjaxRequestTarget target) {
 					}
 				}));
 
-		headerMenuItems.add(new InlineMenuItem(createStringResource("TreeTablePanel.menu.createManager"),
-				false, new HeaderMenuAction(this) {
-
-					@Override
-					public void onClick(AjaxRequestTarget target) {
-						createFocusMemberPerformed(SchemaConstants.ORG_MANAGER, target);
-					}
-				}));
-		headerMenuItems.add(new InlineMenuItem());
+
 
 		headerMenuItems.add(new InlineMenuItem(createStringResource("TreeTablePanel.menu.addMembers"), false,
 				new HeaderMenuAction(this) {
@@ -271,7 +263,7 @@ public void onClick(AjaxRequestTarget target) {
 	}
 
 
-	private void createFocusMemberPerformed(final QName relation, AjaxRequestTarget target) {
+	protected void createFocusMemberPerformed(final QName relation, AjaxRequestTarget target) {
 
 		ChooseFocusTypeDialogPanel chooseTypePopupContent = new ChooseFocusTypeDialogPanel(
 				getPageBase().getMainPopupBodyId()) {
@@ -328,7 +320,7 @@ private void initObjectForAdd(ObjectReferenceType parentOrgRef, QName type, QNam
 
 	}
 
-	private void addMembers(final QName relation, AjaxRequestTarget target) {
+	protected void addMembers(final QName relation, AjaxRequestTarget target) {
 
 		List<QName> types = new ArrayList<>(ObjectTypes.values().length);
 		for (ObjectTypes t : ObjectTypes.values()) {
@@ -339,7 +331,7 @@ UserType.class, types, true, getPageBase()) {
 
 			@Override
 			protected void addPerformed(AjaxRequestTarget target, QName type, List selected) {
-				AbstractRoleMemberPanel.this.addMembersPerformed(type, selected, target);
+				AbstractRoleMemberPanel.this.addMembersPerformed(type, relation, selected, target);
 
 			}
 		};
@@ -361,7 +353,7 @@ protected ObjectQuery createQueryForAdd(List selected) {
 		return ObjectQuery.createObjectQuery(InOidFilter.createInOid(oids));
 	}
 
-	protected abstract void addMembersPerformed(QName type, List selected, AjaxRequestTarget target);
+	protected abstract void addMembersPerformed(QName type, QName relation, List selected, AjaxRequestTarget target);
 	protected abstract void removeMembersPerformed(QueryScope scope, AjaxRequestTarget target);
 	protected abstract void recomputeMembersPerformed(QueryScope scope, AjaxRequestTarget target);
 
@@ -403,6 +395,12 @@ protected ObjectReferenceType createReference(QName relation) {
 		return ref;
 	}
 
+	protected ObjectReferenceType createReference(ObjectType obj, QName relation) {
+		ObjectReferenceType ref = ObjectTypeUtil.createObjectRef(obj);
+		ref.setRelation(relation);
+		return ref;
+	}
+
 	protected void detailsPerformed(AjaxRequestTarget targer, ObjectType object) {
 		Class responsePage = objectDetailsMap.get(object.getClass());
 		if (responsePage == null) {

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
@@ -24,7 +24,12 @@
                         <div wicket:id="managerContainer">
                         <div class="tree-table-header">
                                 <wicket:message key="TreeTablePanel.managers"/>
+                                 <div class="pull-right" wicket:id="managerMenu" />
                             </div>
+
+
+
+
                             <div class="col-md-12" wicket:id="managerTable">
                             <div class="pull-right">
                             	<div wicket:id="editManager" class="fa fa-edit"></div>