From 5707e5908aa0c1432cf80995c922534315a9f0ad Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Wed, 11 Jan 2017 11:08:55 +0100 Subject: [PATCH] Grid inside RolloutView now has a horizontal scrollbar (#404) * Insert placeholder for customizing the space between the last action button and the right border of the rollout table Signed-off-by: Melanie Retter * Insert horizontal scrollbar, widen space between action buttons Signed-off-by: Melanie Retter --- .../ui/rollout/rollout/RolloutListGrid.java | 17 +++++++++++------ .../rolloutgroup/RolloutGroupListGrid.java | 2 -- .../RolloutGroupTargetsListGrid.java | 3 --- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java index 4612a5b7d..ad47ba5b3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java @@ -160,8 +160,8 @@ public class RolloutListGrid extends AbstractGrid { /** * Handles the RolloutChangeEvent to refresh the item in the grid. * - * @param rolloutChangeEvent - * the event which contains the rollout which has been changed + * @param eventContainer + * container which holds the rollout change event */ @SuppressWarnings("unchecked") @EventBusListenerMethod(scope = EventScope.UI) @@ -258,12 +258,12 @@ public class RolloutListGrid extends AbstractGrid { if (permissionChecker.hasRolloutUpdatePermission()) { getColumn(UPDATE_OPTION).setMinimumWidth(25); - getColumn(UPDATE_OPTION).setMaximumWidth(25); + getColumn(UPDATE_OPTION).setMaximumWidth(40); + } else { + getColumn(PAUSE_OPTION).setMaximumWidth(60); } getColumn(VAR_TOTAL_TARGETS_COUNT_STATUS).setMinimumWidth(280); - - setFrozenColumnCount(getColumns().size()); } @Override @@ -290,7 +290,12 @@ public class RolloutListGrid extends AbstractGrid { getColumn(UPDATE_OPTION).setHeaderCaption(i18n.get("header.action.update")); } - final HeaderCell join = getDefaultHeaderRow().join(RUN_OPTION, PAUSE_OPTION, UPDATE_OPTION); + HeaderCell join; + if (permissionChecker.hasRolloutUpdatePermission()) { + join = getDefaultHeaderRow().join(RUN_OPTION, PAUSE_OPTION, UPDATE_OPTION); + } else { + join = getDefaultHeaderRow().join(RUN_OPTION, PAUSE_OPTION); + } join.setText(i18n.get("header.action")); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java index 19682dd2a..1e1b29cc8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java @@ -173,8 +173,6 @@ public class RolloutGroupListGrid extends AbstractGrid { getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_THRESHOLD).setMaximumWidth(100); getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS).setMinimumWidth(280); - - setFrozenColumnCount(7); } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java index bb0c113ea..45e32ded8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java @@ -133,9 +133,6 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid { getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMaximumWidth(180); getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMinimumWidth(50); - - setFrozenColumnCount(getColumns().size()); - } @Override