Changed ConfirmationDialog to main popup window for DefinitionStagePanel

Evolveum · May 6, 2016 · d4a42aa · d4a42aa
1 parent 7058891
commit d4a42aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html b/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
@@ -18,8 +18,6 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 
-    <div wicket:id="confirmDeletePopup" />
-
     <div class="box">
         <div class="box-body no-padding">
             <a class="btn btn-primary btn-sm" wicket:id="addNewStage" style="margin-left: 10px; margin-top: 10px; margin-bottom: 10px" />

diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java b/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.TabbedPanel;
 import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
+import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.certification.dto.StageDefinitionDto;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationStageDefinitionType;
@@ -54,8 +55,6 @@ public class DefinitionStagesPanel extends BasePanel<List<StageDefinitionDto>> {
     private static final String ID_DELETE_STAGE = "deleteStage";
     private static final String DEFAULT_STAGE_NAME_PREFIX = "Stage ";
 
-	private static final String DIALOG_CONFIRM_DELETE = "confirmDeletePopup";
-
 	private TabbedPanel<ITab> tabPanel;
 	private PageCertDefinition parentPage;
 
@@ -120,28 +119,25 @@ public void onSubmit(AjaxRequestTarget target, Form form) {
 		delete.add(visibleIfMoreTabs);
 		add(delete);
 
-		add(new ConfirmationDialog(DIALOG_CONFIRM_DELETE,
-				createStringResource("DefinitionStagesPanel.confirmDelete"),
-				new AbstractReadOnlyModel<String>() {
-					@Override
-					public String getObject() {
-						StageDefinitionDto dto = getModelObject().get(tabPanel.getSelectedTab());
-						return getString("DefinitionStagesPanel.confirmDeleteText", dto.getName());
-					}
-				}) {
-			@Override
-			public void yesPerformed(AjaxRequestTarget target) {
-				close(target);
-				deleteConfirmedPerformed(target);
-			}
-		});
-
         setOutputMarkupId(true);
     }
 
 	private void deletePerformed(AjaxRequestTarget target) {
-		ModalWindow dialog = (ModalWindow) get(DIALOG_CONFIRM_DELETE);
-		dialog.show(target);
+        ConfirmationPanel dialog = new ConfirmationPanel(getPageBase().getMainPopupBodyId(), new AbstractReadOnlyModel<String>() {
+                    @Override
+                    public String getObject() {
+                        StageDefinitionDto dto = getModelObject().get(tabPanel.getSelectedTab());
+                        return getString("DefinitionStagesPanel.confirmDeleteText", dto.getName());
+                    }
+                }){
+            @Override
+            public void yesPerformed(AjaxRequestTarget target) {
+                getPageBase().hideMainPopup(target);
+                deleteConfirmedPerformed(target);
+            }
+        };
+        getPageBase().showMainPopup(dialog, createStringResource("DefinitionStagesPanel.confirmDelete"), target);
+
 	}
 
 	private void addPerformed(AjaxRequestTarget target) {