mid-6211 task menu item visibility

Evolveum · Apr 14, 2020 · 9e06066 · 9e06066
1 parent a9b81dd
commit 9e06066
Showing 1 changed file with 27 additions and 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
@@ -115,7 +115,7 @@ protected List<IColumn<SelectableBean<TaskType>, String>> createColumns() {
 
     @Override
     protected List<InlineMenuItem> 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<InlineMenuItem> createTasksInlineMenu(boolean isHeader) {
+    private List<InlineMenuItem> createTasksInlineMenu() {
         List<InlineMenuItem> items = new ArrayList<>();
         items.add(new ButtonInlineMenuItem(createStringResource("pageTasks.button.suspendTask")) {
             private static final long serialVersionUID = 1L;
@@ -657,30 +657,36 @@ public IModel<Boolean> 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<SelectableBean<TaskType>>() {
-                        private static final long serialVersionUID = 1L;
+            @Override
+            public InlineMenuItemAction initAction() {
+                return new ColumnMenuAction<SelectableBean<TaskType>>() {
+                    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<String> getConfirmationMessageModel() {
-                    return createStringResource("pageTasks.message.deleteAllClosedTasksConfirm");
-                }
+            @Override
+            public IModel<String> getConfirmationMessageModel() {
+                return createStringResource("pageTasks.message.deleteAllClosedTasksConfirm");
+            }
 
-            });
+            @Override
+            public IModel<Boolean> getVisible() {
+                IModel<SelectableBean<TaskType>> rowModel = ((ColumnMenuAction) getAction()).getRowModel();
+                if (rowModel == null) {
+                    return Model.of(Boolean.TRUE);
+                }
+                return Model.of(Boolean.FALSE);
+            }
+        });
 
-        }
         return items;
     }