From 220d949e5871e99fd539a8fcaa544ba156dc574b Mon Sep 17 00:00:00 2001 From: honchar Date: Tue, 10 May 2016 10:05:34 +0200 Subject: [PATCH 1/2] Removed usage of ConfirmationDialog from PageRoles, now main popup is used --- .../web/page/admin/roles/PageRoles.html | 2 - .../web/page/admin/roles/PageRoles.java | 125 +++--------------- .../resources/csvfile/midpoint-flatfile.csv | 7 - 3 files changed, 19 insertions(+), 115 deletions(-) delete mode 100644 samples/resources/csvfile/midpoint-flatfile.csv diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.html index 290a8bc1701..388e9f0308f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.html @@ -18,8 +18,6 @@ -
-
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java index 2583565f8cd..f08529daee6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java @@ -42,6 +42,8 @@ import com.evolveum.midpoint.web.component.data.column.InlineMenuHeaderColumn; import com.evolveum.midpoint.web.component.data.column.LinkColumn; import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog; +import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel; +import com.evolveum.midpoint.web.component.dialog.Popupable; import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem; import com.evolveum.midpoint.web.component.search.Search; import com.evolveum.midpoint.web.component.search.SearchFactory; @@ -88,7 +90,6 @@ public class PageRoles extends PageAdminRoles { private static final String DOT_CLASS = PageRoles.class.getName() + "."; private static final String OPERATION_DELETE_ROLES = DOT_CLASS + "deleteRoles"; - private static final String DIALOG_CONFIRM_DELETE = "confirmDeletePopup"; private static final String ID_TABLE = "table"; private static final String ID_MAIN_FORM = "mainForm"; @@ -99,27 +100,6 @@ public PageRoles() { } public PageRoles(boolean clearPagingInSession) { -// searchModel = new LoadableModel(false) { -// -// @Override -// protected Search load() { -// RolesStorage storage = getSessionStorage().getRoles(); -// Search dto = storage.getSearch(); -// -// if (dto == null) { -// dto = SearchFactory.createSearch(RoleType.class, getPrismContext(), true); -// -// SchemaRegistry registry = getPrismContext().getSchemaRegistry(); -// PrismObjectDefinition objDef = registry.findObjectDefinitionByCompileTimeClass(RoleType.class); -// PrismPropertyDefinition def = objDef.findPropertyDefinition(RoleType.F_REQUESTABLE); -// -// dto.addItem(def); -// } -// -// return dto; -// } -// }; - initLayout(); } @@ -156,69 +136,20 @@ protected void newObjectPerformed(AjaxRequestTarget target) { roleListPanel.setAdditionalBoxCssClasses(GuiStyleConstants.CLASS_OBJECT_ROLE_BOX_CSS_CLASSES); mainForm.add(roleListPanel); -// ObjectDataProvider provider = new ObjectDataProvider(PageRoles.this, RoleType.class) { -// -// @Override -// protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) { -// RolesStorage storage = getSessionStorage().getRoles(); -// storage.setPaging(paging); -// } -// }; -// Search search = searchModel.getObject(); -// ObjectQuery query = search.createObjectQuery(getPrismContext()); -// provider.setQuery(query); -// -// List> columns = initColumns(); -// -// BoxedTablePanel table = new BoxedTablePanel(ID_TABLE, provider, columns, -// UserProfileStorage.TableId.TABLE_ROLES, -// (int) getItemsPerPage(UserProfileStorage.TableId.TABLE_ROLES)) { +// add(new ConfirmationDialog(DIALOG_CONFIRM_DELETE, createStringResource("pageRoles.dialog.title.confirmDelete"), +// createDeleteConfirmString()) { // // @Override -// protected WebMarkupContainer createHeader(String headerId) { -// return new SearchFormPanel(headerId, searchModel) { -// -// @Override -// protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) { -// PageRoles.this.listRolesPerformed(query, target); -// } -// }; +// public void yesPerformed(AjaxRequestTarget target) { +// close(target); +// deleteConfirmedPerformed(target); // } -// }; -// table.setOutputMarkupId(true); -// -// RolesStorage storage = getSessionStorage().getRoles(); -// table.setCurrentPage(storage.getPaging()); -// -// mainForm.add(table); - - add(new ConfirmationDialog(DIALOG_CONFIRM_DELETE, createStringResource("pageRoles.dialog.title.confirmDelete"), - createDeleteConfirmString()) { - - @Override - public void yesPerformed(AjaxRequestTarget target) { - close(target); - deleteConfirmedPerformed(target); - } - }); +// }); } private List, String>> initColumns() { List, String>> columns = new ArrayList<>(); -// IColumn column = new CheckBoxHeaderColumn(); -// columns.add(column); -// -// column = new LinkColumn>(createStringResource("ObjectType.name"), "name", "value.name") { -// -// @Override -// public void onClick(AjaxRequestTarget target, IModel> rowModel) { -// RoleType role = rowModel.getObject().getValue(); -// roleDetailsPerformed(target, role.getOid()); -// } -// }; -// columns.add(column); - IColumn column = new PropertyColumn(createStringResource("OrgType.displayName"), "value.displayName"); columns.add(column); @@ -263,24 +194,10 @@ private MainObjectListPanel getRoleTable() { return (MainObjectListPanel) get(createComponentPath(ID_MAIN_FORM, ID_TABLE)); } -// private ObjectDataProvider, RoleType> getRoleDataProvider() { -// DataTable table = getRoleTable().getDataTable(); -// return (ObjectDataProvider, RoleType>) table.getDataProvider(); -// } - private List getSelectedRoles() { MainObjectListPanel table = getRoleTable(); return table.getSelectedObjects(); -// List> rows = provider.getAvailableData(); -// List selected = new ArrayList(); -// for (SelectableBean row : rows) { -// if (row.isSelected()) { -// selected.add(row.getValue()); -// } -// } -// -// return selected; } private void deletePerformed(AjaxRequestTarget target) { @@ -291,8 +208,7 @@ private void deletePerformed(AjaxRequestTarget target) { return; } - ModalWindow dialog = (ModalWindow) get(DIALOG_CONFIRM_DELETE); - dialog.show(target); + showMainPopup(getDeletePopupContent(), target); } private void deleteConfirmedPerformed(AjaxRequestTarget target) { @@ -333,17 +249,14 @@ private void roleDetailsPerformed(AjaxRequestTarget target, String oid) { setResponsePage(PageRole.class, parameters); } -// private void listRolesPerformed(ObjectQuery query, AjaxRequestTarget target) { -// ObjectDataProvider provider = getRoleDataProvider(); -// provider.setQuery(query); -// -// RolesStorage storage = getSessionStorage().getRoles(); -// storage.setSearch(searchModel.getObject()); -// storage.setPaging(null); -// -// Table table = getRoleTable(); -// table.setCurrentPage(null); -// target.add((Component) table); -// target.add(getFeedbackPanel()); -// } + private Popupable getDeletePopupContent() { + return new ConfirmationPanel(getMainPopupBodyId(), createDeleteConfirmString()) { + @Override + public void yesPerformed(AjaxRequestTarget target) { + hideMainPopup(target); + deleteConfirmedPerformed(target); + } + }; + } + } diff --git a/samples/resources/csvfile/midpoint-flatfile.csv b/samples/resources/csvfile/midpoint-flatfile.csv deleted file mode 100644 index 1b7d0d16346..00000000000 --- a/samples/resources/csvfile/midpoint-flatfile.csv +++ /dev/null @@ -1,7 +0,0 @@ -"id","firstname","lastname","disabled","password" -"user01","Firstname","Lastname","false","secret" -"user02","Test","Lastname","false","secret" -"nnnnn","fffff","lllll","false","password" -"AAAA_DEL_PROJ11","AAAA_DEL_PROJ","last","false","password" -"maxeassign11","maxeassign1","maxeassign1","false","maxeassign1" -"AAA_del_proj_user","AAA_del_proj_user","AAA_del_proj_user","false","AAA_del_proj_user" From d26be267fbca9dcf5394eb9fa87e01e97f97934c Mon Sep 17 00:00:00 2001 From: honchar Date: Tue, 10 May 2016 10:12:43 +0200 Subject: [PATCH 2/2] csv example repairing --- samples/resources/csvfile/midpoint-flatfile.csv | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 samples/resources/csvfile/midpoint-flatfile.csv diff --git a/samples/resources/csvfile/midpoint-flatfile.csv b/samples/resources/csvfile/midpoint-flatfile.csv new file mode 100644 index 00000000000..62c8054230e --- /dev/null +++ b/samples/resources/csvfile/midpoint-flatfile.csv @@ -0,0 +1,3 @@ +"id","firstname","lastname","disabled","password" +"user01","Firstname","Lastname","false","secret" +"user02","Test","Lastname","false","secret" \ No newline at end of file