diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java index 7087a4d03b5..a2477ab53ff 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java @@ -302,36 +302,6 @@ public boolean isVisible() { } }); - // List columns = initColumns(); - // ObjectListPanel table = new - // ObjectListPanel(ID_TABLE, ShadowType.class, - // getPageBase()){ - // @Override - // protected List, String>> - // initColumns() { - // return (List) ResourceContentPanel.this.initColumns(); - // } - // }; - // final BoxedTablePanel> table = new - // BoxedTablePanel(ID_TABLE, provider, columns, - // UserProfileStorage.TableId.PAGE_RESOURCE_ACCOUNTS_PANEL, 10) { - // - // @Override - // protected WebMarkupContainer createHeader(String headerId) { - // return new SearchFormPanel(headerId, searchModel) { - // - // @Override - // protected void searchPerformed(ObjectQuery query, AjaxRequestTarget - // target) { - // ResourceContentPanel.this.searchPerformed(query, target); - // } - // }; - // } - // }; // - // parentPage.getItemsPerPage(UserProfileStorage.TableId.PAGE_RESOURCE_ACCOUNTS_PANEL) - // table.setOutputMarkupId(true); - // add(table); - OperationResult result = new OperationResult(OPERATION_SEARCH_TASKS_FOR_RESOURCE); List> tasks = WebModelServiceUtils @@ -474,72 +444,20 @@ public SelectableBean createDataObjectWrapper(ShadowType obj) { } }; - // try { - // ObjectQuery query = createQuery(); - // provider.setQuery(query); if (query == null) { - // Label label = new Label(ID_TABLE, "Nothing to show. Select intent - // to search"); - // add(label); initCustomLayout(); return provider; } - // } catch (SchemaException e) { - // Label label = new Label(ID_TABLE, "Nothing to show. Select intent to - // search"); - // add(label); - // initCustomLayout(); - // return provider; - // } - provider.setEmptyListOnNullQuery(true); provider.setSort(null); createSearchOptions(provider); return provider; } - // private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) - // { - // BoxedTablePanel> table = getTable(); - // ObjectDataProvider2, ShadowType> provider = - // (ObjectDataProvider2, ShadowType>) table - // .getDataTable().getDataProvider(); - //// BaseSortableDataProvider> provider = - // getDataProvider(); - // ObjectQuery baseQuery; - //// try { - // baseQuery = createQuery(); - // if (baseQuery == null){ - // warn("Could not search objects if either kind/intet or object class is - // set."); - // return; - // } - //// } catch (SchemaException e) { - //// warn("Could not create query."); - //// return; - //// } - // - // - // ObjectQuery customQuery = - // ObjectQuery.createObjectQuery(AndFilter.createAnd(baseQuery.getFilter(), - // query.getFilter())); - // provider.setQuery(customQuery); - // - // // RolesStorage storage = getSessionStorage().getRoles(); - // // storage.setRolesSearch(searchModel.getObject()); - // // storage.setRolesPaging(null); - // - // table = getTable(); - // table.setCurrentPage(null); - // target.add((Component) table); - // target.add(getPageBase().getFeedbackPanel()); - - // } - protected void initCustomLayout() { // Nothing to do, for subclass extension }; @@ -569,8 +487,6 @@ protected ObjectQuery createQuery() { } } } catch (SchemaException ex) { - // LOGGER.error("Could not crate query for shadows: " + - // ex.getMessage(), e); LoggingUtils.logException(LOGGER, "Could not crate query for shadows: " + ex.getMessage(), ex); } return baseQuery; @@ -584,13 +500,10 @@ private void createSearchOptions(SelectableBeanObjectDataProvider provider) { ShadowType.F_ASSOCIATION, GetOperationOptions.createRetrieve(RetrieveOption.EXCLUDE)); if (addAdditionalOptions() != null) { - opts.add(addAdditionalOptions()); // new - // SelectorOptions(GetOperationOptions.createNoFetch())); + opts.add(addAdditionalOptions()); } provider.setUseObjectCounting(isUseObjectCounting()); provider.setOptions(opts); - // return opts; - } private StringResourceModel createStringResource(String key) { @@ -607,26 +520,6 @@ private List, String>> initColumns() { ShadowType.F_INTENT.getLocalPart())); List, String>> columns = new ArrayList<>(); - // IColumn column = new CheckBoxColumn(new Model(), - // SelectableBean.F_SELECTED); - // columns.add(column); - - // columns.add(ColumnUtils.getShadowIconColumn()); - // - // column = new - // LinkColumn>(createStringResource("pageContentAccounts.name"), - // SelectableBean.F_VALUE + ".name") { - // - // @Override - // public void onClick(AjaxRequestTarget target, - // IModel> rowModel) { - // SelectableBean shadow = rowModel.getObject(); - // ShadowType shadowType = shadow.getValue(); - // shadowDetailsPerformed(target, WebComponentUtil.getName(shadowType), - // shadowType.getOid()); - // } - // }; - // columns.add(column); IColumn column = new AbstractColumn, String>( createStringResource("pageContentAccounts.identifiers")) { @@ -900,29 +793,6 @@ public void onSubmit(AjaxRequestTarget target, Form form) { } })); - // items.add(new - // InlineMenuItem(createStringResource("pageContentAccounts.menu.changeOwner"), - // true, - // new HeaderMenuAction(this) { - // - // @Override - // public void onSubmit(AjaxRequestTarget target, Form form) { - // - // FocusBrowserPanel browser = new - // FocusBrowserPanel( - // pageBase.getMainPopupBodyId(), UserType.class, - // WebComponentUtil.createFocusTypeList(), false, pageBase) { - // protected void onClick(AjaxRequestTarget target, UserType focus) { - // changeOwner(null, target, focus, Operation.MODIFY); - // } - // }; - // - // pageBase.showMainPopup(browser, new Model("ChangeOwner"), - // target, 900, 500); - // - // } - // })); - return items; } @@ -1010,8 +880,6 @@ protected void onSelectPerformed(AjaxRequestTarget target, UserType focus) { } protected void importResourceObject(ShadowType selected, AjaxRequestTarget target) { - // List> selectedShadow = - // WebComponentUtil.getSelectedData(getTable()); List selectedShadow = null; if (selected != null) { selectedShadow = new ArrayList<>(); @@ -1049,8 +917,6 @@ protected void importResourceObject(ShadowType selected, AjaxRequestTarget targe // TODO: as a task? protected void deleteResourceObjectPerformed(ShadowType selected, AjaxRequestTarget target) { - // List> selectedShadow = - // WebComponentUtil.getSelectedData(getTable()); List selectedShadow = null; if (selected != null) { selectedShadow = new ArrayList<>(); @@ -1157,8 +1023,7 @@ private MainObjectListPanel getTable() { private void changeOwner(ShadowType selected, AjaxRequestTarget target, FocusType ownerToChange, Operation operation) { - // List> selectedShadow = - // WebComponentUtil.getSelectedData(getTable()); + List selectedShadow = null; if (selected != null) { selectedShadow = new ArrayList<>(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java index eee124b35e2..b6a6b8e15d3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java @@ -64,35 +64,9 @@ protected boolean isUseObjectCounting() { protected Search createSearch() { Map availableDefs = new HashMap<>(); availableDefs.putAll(createAttributeDefinitionList()); - - Search search = new Search(ShadowType.class, availableDefs); -// search.setShowAdvanced(true); - -// SchemaRegistry registry = ctx.getSchemaRegistry(); -// PrismObjectDefinition objDef = registry.findObjectDefinitionByCompileTimeClass(Sh.class); -// PrismPropertyDefinition def = objDef.findPropertyDefinition(ObjectType.F_NAME); -// -// search.addItem(def); - - return search; + return new Search(ShadowType.class, availableDefs); } -// private Search createSearch() { -// Map availableDefs = new HashMap<>(); -// availableDefs.putAll(createAttributeDefinitionList()); -// -// Search search = new Search(ShadowType.class, availableDefs); -// search.setShowAdvanced(true); -// -//// SchemaRegistry registry = ctx.getSchemaRegistry(); -//// PrismObjectDefinition objDef = registry.findObjectDefinitionByCompileTimeClass(Sh.class); -//// PrismPropertyDefinition def = objDef.findPropertyDefinition(ObjectType.F_NAME); -//// -//// search.addItem(def); -// -// return search; -// } - private Map createAttributeDefinitionList() { Map map = new HashMap<>(); @@ -113,10 +87,8 @@ private Map createAttributeDefi return map; } - ItemPath attributePath = new ItemPath(ShadowType.F_ATTRIBUTES); -// PrismContainerDefinition attrs = objDef.findContainerDefinition(ShadowType.F_ATTRIBUTES); for (ItemDefinition def : (List) ocDef.getDefinitions()) { if (!(def instanceof PrismPropertyDefinition) && !(def instanceof PrismReferenceDefinition)) { continue;