Merge remote-tracking branch 'origin/master'

Evolveum · Apr 10, 2019 · f4c5595 · f4c5595
2 parents 67d9f06 + d319402
commit f4c5595
Show file tree

Hide file tree

Showing 33 changed files with 1,355 additions and 846 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java b/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
@@ -27,6 +27,8 @@
 import com.evolveum.midpoint.web.component.util.EnableBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.admin.configuration.component.HeaderMenuAction;
+
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -46,6 +48,7 @@
  * @author honchar
  * @author Viliam Repan (lazyman)
  * <p>
+ * 
  */
 public class InlineMenuButtonColumn<T extends Serializable> extends AbstractColumn<T, String> {
 
@@ -88,6 +91,11 @@ private Component getPanel(String componentId, IModel<T> rowModel,
             if (rowModel != null && menuItem.getAction() != null && menuItem.getAction() instanceof ColumnMenuAction){
                 ((ColumnMenuAction) menuItem.getAction()).setRowModel(rowModel);
             }
+
+            if (menuItem.isCheckVisibility() && !isInlineMenuVisible(rowModel, isHeaderPanel)) {
+            	continue;
+            }
+
             filteredMenuItems.add(menuItem);
         }
         if (rowModel != null && rowModel.getObject() instanceof InlineMenuable &&
@@ -127,6 +135,10 @@ protected AjaxIconButton createButton(int index, String componentId, IModel<T> m
             }
         };
     }
+
+    protected boolean isInlineMenuVisible(IModel<T> rowModel, boolean isHeader) {
+    	return true;
+    }
 
     protected boolean isButtonMenuItemEnabled(IModel<T> rowModel){
         return true;
@@ -233,6 +245,7 @@ private boolean isPanelVisible(boolean isHeaderPanel){
             if (!isHeaderPanel && !(item.getAction() instanceof HeaderMenuAction)){
                 return true;
             }
+
         }
         return false;
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
@@ -20,6 +20,7 @@
 import org.apache.wicket.model.Model;
 
 import java.io.Serializable;
+import java.util.function.Supplier;
 
 /**
  * TODO: update to better use with DropdownButtonPanel. Move away from depreated com.evolveum.midpoint.web.component.menu.cog.
@@ -35,6 +36,8 @@ public abstract class InlineMenuItem implements Serializable {
     private boolean submit = false;
     private InlineMenuItemAction action;
     private int id = -1;
+
+    private boolean checkVisibility;
 
     public InlineMenuItem(IModel<String> label) {
         this.label = label;
@@ -115,4 +118,13 @@ public IModel<String> getConfirmationMessageModel() {
    public boolean showConfirmationDialog() {
         return true;
     }
+
+   public boolean isCheckVisibility() {
+	   return checkVisibility;
+   }
+
+   public void setCheckVisibility(boolean checkVisibility) {
+	   this.checkVisibility = checkVisibility;
+   }
+
 }