diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java index 06c88788491..18f460928e0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java @@ -21,15 +21,15 @@ import com.evolveum.midpoint.web.component.data.column.LinkColumn; import com.evolveum.midpoint.web.component.util.ListDataProvider; import com.evolveum.midpoint.web.component.util.LoadableModel; -import com.evolveum.midpoint.web.component.util.SelectableBean; import com.evolveum.midpoint.web.page.PageBase; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; +import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; import java.util.ArrayList; @@ -71,7 +71,7 @@ protected List load() { public void updateData(AjaxRequestTarget target, List newData){ data.setObject(newData); - target.add(getContent()); + target.add(get(getContentId() + ":" + ID_TABLE)); } public StringResourceModel createStringResource(String resourceKey, Object... objects) { @@ -95,8 +95,8 @@ protected void onBeforeRender(){ } public void initLayout(WebMarkupContainer content){ - List, String>> columns = initColumns(); - ListDataProvider provider = new ListDataProvider(getPageBase(), new Model(data)); + List> columns = initColumns(); + ListDataProvider provider = new ListDataProvider(getPageBase(), data); TablePanel table = new TablePanel<>(ID_TABLE, provider, columns); table.setOutputMarkupId(true); @@ -113,20 +113,23 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) { content.add(cancelButton); } - private List, String>> initColumns(){ - List, String>> columns = new ArrayList<>(); + private List> initColumns(){ + List> columns = new ArrayList<>(); - IColumn column = new LinkColumn>(createStringResource("AssignmentPreviewDialog.column.name"), "value.name"){ + IColumn column = new LinkColumn(createStringResource("AssignmentPreviewDialog.column.name"), "name"){ @Override - public void onClick(AjaxRequestTarget target, IModel> rowModel){ - ObjectType object = rowModel.getObject().getValue(); - chooseOperationPerformed(target, object); + public void onClick(AjaxRequestTarget target, IModel rowModel){ + RoleType role = rowModel.getObject(); + chooseOperationPerformed(target, role); } }; columns.add(column); + column = new PropertyColumn(createStringResource("AssignmentPreviewDialog.column.description"), "description"); + columns.add(column); + return columns; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.properties index 30c54590a6f..9548e1a20ce 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.properties +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.properties @@ -16,4 +16,5 @@ AssignmentPreviewDialog.label=View direct & indirect assignments AssignmentPreviewDialog.button.cancel=Cancel -AssignmentPreviewDialog.column.name=Name \ No newline at end of file +AssignmentPreviewDialog.column.name=Name +AssignmentPreviewDialog.column.description=Description \ No newline at end of file