Skip to content

Commit

Permalink
Removed usage of ConfirmationDialog from PageRoles, now main popup is…
Browse files Browse the repository at this point in the history 
… used
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed May 10, 2016
1 parent fb23ea4 commit 220d949
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 115 deletions.
2 changes: 0 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.html
View file
Expand Up @@ -18,8 +18,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>
Expand Down
125 changes: 19 additions & 106 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

Expand All @@ -99,27 +100,6 @@ public PageRoles() {
}

public PageRoles(boolean clearPagingInSession) {
// searchModel = new LoadableModel<Search>(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();
}

Expand Down Expand Up @@ -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<IColumn<RoleType, String>> 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<IColumn<SelectableBean<RoleType>, String>> initColumns() {
List<IColumn<SelectableBean<RoleType>, String>> columns = new ArrayList<>();

// IColumn column = new CheckBoxHeaderColumn<RoleType>();
// columns.add(column);
//
// column = new LinkColumn<SelectableBean<RoleType>>(createStringResource("ObjectType.name"), "name", "value.name") {
//
// @Override
// public void onClick(AjaxRequestTarget target, IModel<SelectableBean<RoleType>> 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);

Expand Down Expand Up @@ -263,24 +194,10 @@ private MainObjectListPanel<RoleType> getRoleTable() {
return (MainObjectListPanel<RoleType>) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
}

// private ObjectDataProvider<SelectableBean<RoleType>, RoleType> getRoleDataProvider() {
// DataTable table = getRoleTable().getDataTable();
// return (ObjectDataProvider<SelectableBean<RoleType>, RoleType>) table.getDataProvider();
// }

private List<RoleType> getSelectedRoles() {
MainObjectListPanel<RoleType> table = getRoleTable();
return table.getSelectedObjects();

// List<SelectableBean<RoleType>> rows = provider.getAvailableData();
// List<RoleType> selected = new ArrayList<RoleType>();
// for (SelectableBean<RoleType> row : rows) {
// if (row.isSelected()) {
// selected.add(row.getValue());
// }
// }
//
// return selected;
}

private void deletePerformed(AjaxRequestTarget target) {
Expand All @@ -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) {
Expand Down Expand Up @@ -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);
}
};
}

}
7 changes: 0 additions & 7 deletions samples/resources/csvfile/midpoint-flatfile.csv
View file

This file was deleted.

0 comments on commit 220d949

Please sign in to comment.