Merge remote-tracking branch 'origin/master'

Evolveum · Jul 13, 2017 · 76db2a5 · 76db2a5
2 parents d48847e + 134736f
commit 76db2a5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -23,7 +23,9 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.schema.util.ShadowUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import org.apache.wicket.Component;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -246,6 +248,27 @@ public String getObject() {
 					}
 				};
 			}
+
+			@Override
+			public Component getHeader(String componentId) {
+				return new Label(componentId, "");
+			}
+
+			@Override
+			public IModel<String> getDataModel(IModel<SelectableBean<T>> rowModel) {
+				T shadow = rowModel.getObject().getValue();
+				if (shadow == null){
+					return super.getDataModel(rowModel);
+				}
+				return ShadowUtil.isProtected(shadow.asPrismContainer()) ?
+						createStringResource("ThreeStateBooleanPanel.true") : createStringResource("ThreeStateBooleanPanel.false");
+			}
+
+
+			@Override
+			public IModel<String> getDisplayModel(){
+				return createStringResource("pageContentAccounts.isProtected");
+			}
 		};
 	}
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/IconColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/IconColumn.java
@@ -16,15 +16,21 @@
 
 package com.evolveum.midpoint.web.component.data.column;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.export.IExportableColumn;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 
 /**
  * @author lazyman
  */
-public class IconColumn<T> extends AbstractColumn<T, String> {
+public class IconColumn<T> extends AbstractColumn<T, String> implements IExportableColumn<T, String> {
+    private static final long serialVersionUID = 1L;
 
     public IconColumn(IModel<String> displayModel) {
         super(displayModel);
@@ -47,4 +53,9 @@ protected IModel<String> createTitleModel(final IModel<T> rowModel) {
     protected IModel<String> createIconModel(final IModel<T> rowModel) {
         throw new UnsupportedOperationException("Not implemented, please implement in your column.");
     }
+
+    @Override
+    public IModel<String> getDataModel(IModel<T> rowModel) {
+        return Model.of("");
+    }
 }
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
@@ -644,23 +644,6 @@ public void onClick(AjaxRequestTarget target, IModel<SelectableBean<ShadowType>>
 
 			}
 		});
-
-		IColumn<SelectableBean<ShadowType>, String> isProtectedAccountColumn =
-				new AbstractExportableColumn<SelectableBean<ShadowType>, String>(createStringResource("pageContentAccounts.isProtected")) {
-                    @Override
-                    public void populateItem(Item<ICellPopulator<SelectableBean<ShadowType>>> cellItem,
-                                             String componentId, IModel<SelectableBean<ShadowType>> rowModel) {
-                        Boolean isProtected = rowModel.getObject().getValue().isProtectedObject();
-                        cellItem.add(new Label(componentId, isProtected != null ? Boolean.toString(isProtected) : Boolean.toString(false)));
-
-                    }
-                    @Override
-                    public IModel<String> getDataModel(IModel<SelectableBean<ShadowType>> rowModel) {
-                        Boolean isProtected = rowModel.getObject().getValue().isProtectedObject();
-                        return Model.of(isProtected != null ? Boolean.toString(isProtected) : Boolean.toString(false));
-                    }
-                };
-		columns.add(isProtectedAccountColumn);
 		return columns;
 	}