From 9e06066acccbd5d105d3ebaf5995cfc2f333265f Mon Sep 17 00:00:00 2001 From: kate Date: Tue, 14 Apr 2020 12:06:15 +0200 Subject: [PATCH] mid-6211 task menu item visibility --- .../web/page/admin/server/TaskTablePanel.java | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java index b5dbea35b24..a3c6faa3b5a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java @@ -115,7 +115,7 @@ protected List, String>> createColumns() { @Override protected List createInlineMenu() { - return createTasksInlineMenu(true); + return createTasksInlineMenu(); } @Override @@ -371,7 +371,7 @@ private Long xgc2long(XMLGregorianCalendar gc) { return gc != null ? XmlTypeConverter.toMillis(gc) : null; } - private List createTasksInlineMenu(boolean isHeader) { + private List createTasksInlineMenu() { List items = new ArrayList<>(); items.add(new ButtonInlineMenuItem(createStringResource("pageTasks.button.suspendTask")) { private static final long serialVersionUID = 1L; @@ -657,30 +657,36 @@ public IModel getVisible() { }; items.add(deleteWorkState); - if (isHeader) { - items.add(new InlineMenuItem(createStringResource("pageTasks.button.deleteAllClosedTasks")) { - private static final long serialVersionUID = 1L; + items.add(new InlineMenuItem(createStringResource("pageTasks.button.deleteAllClosedTasks")) { + private static final long serialVersionUID = 1L; - @Override - public InlineMenuItemAction initAction() { - return new ColumnMenuAction>() { - private static final long serialVersionUID = 1L; + @Override + public InlineMenuItemAction initAction() { + return new ColumnMenuAction>() { + private static final long serialVersionUID = 1L; - @Override - public void onClick(AjaxRequestTarget target) { - deleteAllClosedTasksConfirmedPerformed(target); - } - }; - } + @Override + public void onClick(AjaxRequestTarget target) { + deleteAllClosedTasksConfirmedPerformed(target); + } + }; + } - @Override - public IModel getConfirmationMessageModel() { - return createStringResource("pageTasks.message.deleteAllClosedTasksConfirm"); - } + @Override + public IModel getConfirmationMessageModel() { + return createStringResource("pageTasks.message.deleteAllClosedTasksConfirm"); + } - }); + @Override + public IModel getVisible() { + IModel> rowModel = ((ColumnMenuAction) getAction()).getRowModel(); + if (rowModel == null) { + return Model.of(Boolean.TRUE); + } + return Model.of(Boolean.FALSE); + } + }); - } return items; }