Finally fixing the outcome column CSS (MID-4477)

Evolveum · Mar 2, 2018 · f6284ee · f6284ee
1 parent 9b683d7
commit f6284ee
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2018 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,30 +16,32 @@
 
 package com.evolveum.midpoint.web.component.wf;
 
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
-import com.evolveum.midpoint.web.component.data.column.IconColumn;
-import com.evolveum.midpoint.web.component.util.ListDataProvider;
-import com.evolveum.midpoint.web.page.admin.server.dto.ApprovalOutcomeIcon;
-import com.evolveum.midpoint.web.page.admin.workflow.dto.DecisionDto;
-import com.evolveum.midpoint.web.session.UserProfileStorage;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
+import com.evolveum.midpoint.web.component.data.column.IconColumn;
+import com.evolveum.midpoint.web.component.util.ListDataProvider;
+import com.evolveum.midpoint.web.page.admin.server.dto.ApprovalOutcomeIcon;
+import com.evolveum.midpoint.web.page.admin.workflow.dto.DecisionDto;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 
 /**
  * @author lazyman
  * @author mederly
  */
 public class DecisionsPanel extends BasePanel<List<DecisionDto>> {
+	private static final long serialVersionUID = 1L;
 
-    private static final String ID_DECISIONS_TABLE = "decisionsTable";
+	private static final String ID_DECISIONS_TABLE = "decisionsTable";
 
     // todo options to select which columns will be shown
     public DecisionsPanel(String id, IModel<List<DecisionDto>> model, UserProfileStorage.TableId tableId, int pageSize) {
@@ -66,19 +68,30 @@ protected void initLayout(UserProfileStorage.TableId tableId, int pageSize) {
 	@NotNull
 	private IconColumn<DecisionDto> createOutcomeColumn() {
 		return new IconColumn<DecisionDto>(createStringResource("DecisionsPanel.result")) {
+			private static final long serialVersionUID = 1L;
+
 			@Override
 			protected IModel<String> createIconModel(final IModel<DecisionDto> rowModel) {
 				return new AbstractReadOnlyModel<String>() {
+					private static final long serialVersionUID = 1L;
+
 					@Override
 					public String getObject() {
 						return choose(rowModel, ApprovalOutcomeIcon.IN_PROGRESS.getIcon(), ApprovalOutcomeIcon.APPROVED.getIcon(), ApprovalOutcomeIcon.REJECTED.getIcon());
 					}
 				};
 			}
+
+			@Override
+		    public String getCssClass() {
+		        return "shrink";
+		    }
 
 			@Override
 			protected IModel<String> createTitleModel(final IModel<DecisionDto> rowModel) {
 				return new AbstractReadOnlyModel<String>() {
+					private static final long serialVersionUID = 1L;
+
 					@Override
 					public String getObject() {
 						return choose(rowModel,

diff --git a/...m/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalHistoryPanel.java b/...m/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalHistoryPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2018 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,9 @@
  * @author mederly
  */
 public class ItemApprovalHistoryPanel extends BasePanel<WfContextType> {
+	private static final long serialVersionUID = 1L;
 
-    private static final Trace LOGGER = TraceManager.getTrace(ItemApprovalHistoryPanel.class);
+	private static final Trace LOGGER = TraceManager.getTrace(ItemApprovalHistoryPanel.class);
 
     private static final String ID_DECISIONS_DONE = "decisionsDone";