Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 9, 2016 · 03c17fc · 03c17fc
2 parents 6938a47 + fe2a4d3
commit 03c17fc
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 77 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.html b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.html
@@ -17,8 +17,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:extend>
-    <div wicket:id="confirmDeletePopup"/>
-
     <form wicket:id="mainForm" class="form-inline">
         <div wicket:id="table"/>
     </form>

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
@@ -43,8 +43,10 @@
 import com.evolveum.midpoint.web.component.data.column.InlineMenuHeaderColumn;
 import com.evolveum.midpoint.web.component.data.column.InlineMenuable;
 import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
+import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
+import com.evolveum.midpoint.web.page.admin.certification.dto.StageDefinitionDto;
 import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration;
 import com.evolveum.midpoint.web.page.admin.configuration.component.HeaderMenuAction;
 import com.evolveum.midpoint.web.page.admin.home.dto.PersonalInfoDto;
@@ -111,9 +113,7 @@ public class PageCreatedReports extends PageAdminReports {
     private static final String ID_CREATED_REPORTS_TABLE = "table";
     private static final String ID_SEARCH_FORM = "searchForm";
     private static final String ID_BASIC_SEARCH = "basicSearch";
-    private static final String ID_FILTER_FILE_TYPE = "filetype";
     private static final String ID_REPORT_TYPE_SELECT = "reportType";
-    private static final String ID_CONFIRM_DELETE = "confirmDeletePopup";
     private static final String ID_TABLE_HEADER = "tableHeader";
 
     private LoadableModel<ReportOutputSearchDto> searchModel;
@@ -228,28 +228,6 @@ protected WebMarkupContainer createHeader(String headerId) {
         table.setShowPaging(true);
         table.setOutputMarkupId(true);
         mainForm.add(table);
-
-        add(new ConfirmationDialog(ID_CONFIRM_DELETE, createStringResource("pageCreatedReports.dialog.title.confirmDelete"),
-                createDeleteConfirmString()) {
-
-            @Override
-            public void yesPerformed(AjaxRequestTarget target) {
-                close(target);
-
-                ReportDeleteDialogDto dto = deleteModel.getObject();
-                switch (dto.getOperation()) {
-                    case DELETE_SINGLE:
-                        deleteSelectedConfirmedPerformed(target, Arrays.asList(dto.getObjects().get(0)));
-                        break;
-                    case DELETE_SELECTED:
-                        deleteSelectedConfirmedPerformed(target, dto.getObjects());
-                        break;
-                    case DELETE_ALL:
-                        deleteAllConfirmedPerformed(target);
-                        break;
-                }
-            }
-        });
     }
 
     //TODO - commented until FileType property will be available in ReportOutputType
@@ -415,13 +393,36 @@ private ObjectDataProvider getTableDataProvider() {
     }
 
     private void deleteAllPerformed(AjaxRequestTarget target, ReportDeleteDialogDto.Operation op) {
-        ReportDeleteDialogDto dto = new ReportDeleteDialogDto(op, null);
+        final ReportDeleteDialogDto dto = new ReportDeleteDialogDto(op, null);
         deleteModel.setObject(dto);
 
-        ModalWindow dialog = (ModalWindow) get(ID_CONFIRM_DELETE);
-        dialog.show(target);
+        getPageBase().showMainPopup(getDeleteDialogPanel(), createStringResource("pageCreatedReports.dialog.title.confirmDelete"), target);
+    }
+
+    private ConfirmationPanel getDeleteDialogPanel(){
+        ConfirmationPanel dialog = new ConfirmationPanel(getPageBase().getMainPopupBodyId(), createDeleteConfirmString()){
+            @Override
+            public void yesPerformed(AjaxRequestTarget target) {
+                getPageBase().hideMainPopup(target);
+
+                ReportDeleteDialogDto dto = deleteModel.getObject();
+                switch (dto.getOperation()) {
+                    case DELETE_SINGLE:
+                        deleteSelectedConfirmedPerformed(target, Arrays.asList(dto.getObjects().get(0)));
+                        break;
+                    case DELETE_SELECTED:
+                        deleteSelectedConfirmedPerformed(target, dto.getObjects());
+                        break;
+                    case DELETE_ALL:
+                        deleteAllConfirmedPerformed(target);
+                        break;
+                }
+            }
+        };
+        return dialog;
     }
 
+
     private void deleteSelectedPerformed(AjaxRequestTarget target, ReportDeleteDialogDto.Operation op, ReportOutputType single) {
         List<ReportOutputType> selected = getSelectedData();
 
@@ -437,8 +438,7 @@ private void deleteSelectedPerformed(AjaxRequestTarget target, ReportDeleteDialo
         ReportDeleteDialogDto dto = new ReportDeleteDialogDto(op, selected);
         deleteModel.setObject(dto);
 
-        ModalWindow dialog = (ModalWindow) get(ID_CONFIRM_DELETE);
-        dialog.show(target);
+        getPageBase().showMainPopup(getDeleteDialogPanel(), createStringResource("pageCreatedReports.dialog.title.confirmDelete"), target);
     }
 
     private void deleteSelectedConfirmedPerformed(AjaxRequestTarget target, List<ReportOutputType> objects) {

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));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
@@ -98,6 +98,8 @@ protected void onConfigure() {
         error(getString(key));
 
         httpSession.removeAttribute(WebAttributes.AUTHENTICATION_EXCEPTION);
+
+        getSessionStorage().clearBreadcrumbs();
     }
 
     @Override

diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE.less b/gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE.less
@@ -58,7 +58,7 @@
 @import "login_and_register.less";
 @import "404_500_errors.less";
 @import "invoice.less";
-@import "profile";
+@import "profile.less";
 
 //Plugins
 //--------

diff --git a/samples/evolveum/org-users.xml b/samples/evolveum/org-users.xml
@@ -187,7 +187,7 @@
 
 	<!-- Users -->
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000001">
 		<name>ifarinic</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001200" type="c:OrgType"/> <!-- No "relation" in the ref means "member" -->
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001200" type="c:OrgType" relation="org:manager"/>
@@ -215,10 +215,12 @@
 		<familyName>Farinič</familyName>
 		<honorificPrefix>Mgr.</honorificPrefix>
 		<title>CEO</title>
+		<emailAddress>igor.farinic@evolveum.com</emailAddress>
+		<employeeNumber>001</employeeNumber>
 		<locality>Košice</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000002">
 		<name>semancik</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001100" type="c:OrgType"/> <!-- No "relation" in the ref means "member" -->
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001100" type="c:OrgType" relation="org:manager"/>
@@ -255,10 +257,12 @@
 		<honorificPrefix>Ing.</honorificPrefix>
 		<honorificSuffix>PhD</honorificSuffix>
 		<title>Software Architect</title>
+		<emailAddress>radovan.semancik@evolveum.com</emailAddress>
+		<employeeNumber>002</employeeNumber>
 		<locality>Lozorno</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000003">
 		<name>katkav</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001110" type="c:OrgType"/>
 		<parentOrgRef oid="00000000-ee88-6666-0000-200000000001" type="c:OrgType"/>
@@ -282,10 +286,12 @@
 		<familyName>Valaliková</familyName>
 		<honorificPrefix>Ing.</honorificPrefix>
 		<title>Software Developer</title>
+		<emailAddress>katarika.valalikova@evolveum.com</emailAddress>
+		<employeeNumber>003</employeeNumber>
 		<locality>Bratislava</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000004">
 		<name>mederly</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001110" type="c:OrgType"/>
 		<parentOrgRef oid="00000000-ee88-6666-0000-200000000001" type="c:OrgType"/>
@@ -306,10 +312,12 @@
 		<honorificPrefix>Mgr.</honorificPrefix>
 		<honorificSuffix>PhD</honorificSuffix>
 		<title>Software Developer</title>
+		<emailAddress>pavol.mederly@evolveum.com</emailAddress>
+		<employeeNumber>004</employeeNumber>
 		<locality>Kalná nad Hronom</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000005">
 		<name>lazyman</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001110" type="c:OrgType"/>
 		<parentOrgRef oid="00000000-ee88-6666-0000-200000000001" type="c:OrgType"/>
@@ -325,10 +333,12 @@
 		<familyName>Repáň</familyName>
 		<honorificPrefix>Ing.</honorificPrefix>
 		<title>Software Developer</title>
+		<emailAddress>viliam.repan@evolveum.com</emailAddress>
+		<employeeNumber>005</employeeNumber>
 		<locality>Bratislava</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000006">
 		<name>honchar</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001110" type="c:OrgType"/>
 		<parentOrgRef oid="00000000-ee88-6666-0000-200000000001" type="c:OrgType"/>
@@ -343,10 +353,12 @@
 		<givenName>Kate</givenName>
 		<familyName>Honchar</familyName>
 		<title>Software Developer</title>
+		<emailAddress>kate.honchar@evolveum.com</emailAddress>
+		<employeeNumber>006</employeeNumber>
 		<locality>Bratislava</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000007">
 		<name>vix</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001120" type="c:OrgType"/>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001130" type="c:OrgType"/>
@@ -370,10 +382,12 @@
 		<familyName>Noris</familyName>
 		<honorificPrefix>Ing.</honorificPrefix>
 		<title>IDM Engineer</title>
+		<emailAddress>ivan.noris@evolveum.com</emailAddress>
+		<employeeNumber>007</employeeNumber>
 		<locality>Bratislava</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000008">
 		<name>oscar</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001120" type="c:OrgType"/>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001130" type="c:OrgType"/>		
@@ -393,10 +407,12 @@
 		<familyName>Pálos</familyName>
 		<honorificPrefix>Mgr.</honorificPrefix>
 		<title>IDM Engineer</title>
+		<emailAddress>gustav.palos@evolveum.com</emailAddress>
+		<employeeNumber>008</employeeNumber>
 		<locality>Bratislava</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000009">
 		<name>zibri</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001220" type="c:OrgType"/>		
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001220" type="c:OrgType" relation="org:manager"/>
@@ -410,10 +426,12 @@
 		<givenName>Andrea</givenName>
 		<familyName>Žibritovská</familyName>
 		<title>CFO</title>
+		<emailAddress>andrea.zibritovska@evolveum.com</emailAddress>
+		<employeeNumber>009</employeeNumber>
 		<locality>Bratislava</locality>
 	</user>
 
-	<user>
+	<user oid="00000000-ee88-6666-0000-000000000010">
 		<name>vera</name>
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001210" type="c:OrgType"/>		
 		<parentOrgRef oid="00000000-ee88-6666-0000-100000001210" type="c:OrgType" relation="org:manager"/>
@@ -436,6 +454,8 @@
 		<givenName>Veronika</givenName>
 		<familyName>Kolpaščikovová</familyName>
 		<title>Marketing Specialist</title>
+		<emailAddress>veronika.kolpascikovova@evolveum.com</emailAddress>
+		<employeeNumber>010</employeeNumber>
 		<locality>Zvolen</locality>
 	</user>