Changed ConfirmationDialog to ConfirmationPanel with using of main po…

…pup for PageResources
Evolveum · May 9, 2016 · 119019a · 119019a
1 parent 104de2b
commit 119019a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 35 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.html b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.html
@@ -18,9 +18,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:extend>
-	<div wicket:id="deleteResourcesPopup" />
-    <div wicket:id="deleteHostsPopup" />
-
     <form wicket:id="mainForm" class="clearfix form-horizontal">
         <h3><wicket:message key="pageResources.resources"/></h3>
         <div wicket:id="table"/>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
@@ -20,6 +20,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
+import com.evolveum.midpoint.web.page.admin.certification.dto.StageDefinitionDto;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -92,8 +94,6 @@ public class PageResources extends PageAdminResources {
 	private static final String OPERATION_DELETE_HOSTS = DOT_CLASS + "deleteHosts";
 	private static final String OPERATION_CONNECTOR_DISCOVERY = DOT_CLASS + "connectorDiscovery";
 
-	private static final String ID_DELETE_RESOURCES_POPUP = "deleteResourcesPopup";
-	private static final String ID_DELETE_HOSTS_POPUP = "deleteHostsPopup";
 	private static final String ID_MAIN_FORM = "mainForm";
 	private static final String ID_TABLE = "table";
 	private static final String ID_CONNECTOR_TABLE = "connectorTable";
@@ -200,30 +200,6 @@ protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 		};
 		connectorHosts.setOutputMarkupId(true);
 		mainForm.add(connectorHosts);
-
-		add(new ConfirmationDialog(ID_DELETE_RESOURCES_POPUP,
-				createStringResource("pageResources.dialog.title.confirmDelete"),
-				createDeleteConfirmString("pageResources.message.deleteResourceConfirm",
-						"pageResources.message.deleteResourcesConfirm", true)) {
-
-			@Override
-			public void yesPerformed(AjaxRequestTarget target) {
-				close(target);
-				deleteResourceConfirmedPerformed(target);
-			}
-		});
-
-		add(new ConfirmationDialog(ID_DELETE_HOSTS_POPUP,
-				createStringResource("pageResources.dialog.title.confirmDelete"),
-				createDeleteConfirmString("pageResources.message.deleteHostConfirm",
-						"pageResources.message.deleteHostsConfirm", false)) {
-
-			@Override
-			public void yesPerformed(AjaxRequestTarget target) {
-				close(target);
-				deleteHostConfirmedPerformed(target);
-			}
-		});
 	}
 
 	private List<InlineMenuItem> createRowMenuItems() {
@@ -380,9 +356,18 @@ private void deleteHostPerformed(AjaxRequestTarget target) {
 			return;
 		}
 
-		ModalWindow dialog = (ModalWindow) get(ID_DELETE_HOSTS_POPUP);
-		dialog.show(target);
-	}
+        ConfirmationPanel dialog = new ConfirmationPanel(((PageBase)getPage()).getMainPopupBodyId(),
+                createDeleteConfirmString("pageResources.message.deleteHostConfirm",
+                "pageResources.message.deleteHostsConfirm", false)){
+            @Override
+            public void yesPerformed(AjaxRequestTarget target) {
+                ((PageBase)getPage()).hideMainPopup(target);
+                deleteHostConfirmedPerformed(target);
+            }
+        };
+        ((PageBase)getPage()).showMainPopup(dialog, createStringResource("pageResources.dialog.title.confirmDelete"), target);
+
+    }
 
 	private List<ResourceType> isAnyResourceSelected(AjaxRequestTarget target, ResourceType single) {
 		List<ResourceType> selected = null;
@@ -407,9 +392,17 @@ private void deleteResourcePerformed(AjaxRequestTarget target, ResourceType sing
 			return;
 		}
 
-		ModalWindow dialog = (ModalWindow) get(ID_DELETE_RESOURCES_POPUP);
-		dialog.show(target);
-	}
+        ConfirmationPanel dialog = new ConfirmationPanel(((PageBase)getPage()).getMainPopupBodyId(),
+                createDeleteConfirmString("pageResources.message.deleteResourceConfirm",
+                        "pageResources.message.deleteResourcesConfirm", true)){
+            @Override
+            public void yesPerformed(AjaxRequestTarget target) {
+                ((PageBase)getPage()).hideMainPopup(target);
+                deleteResourceConfirmedPerformed(target);
+            }
+        };
+        ((PageBase)getPage()).showMainPopup(dialog, createStringResource("pageResources.dialog.title.confirmDelete"), target);
+    }
 
 	private MainObjectListPanel<ResourceType> getResourceTable() {
 		return (MainObjectListPanel<ResourceType>) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));