lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Grid inside RolloutView now has a horizontal scrollbar (#404)

Browse Source 
* Insert placeholder for customizing the space between the last action
button and the right border of the rollout table

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Insert horizontal scrollbar, widen space between
action buttons

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2017-01-11 11:08:55 +01:00
committed by Kai Zimmermann
parent a9c337af6a
commit 5707e5908a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
View File

@@ -160,8 +160,8 @@ public class RolloutListGrid extends AbstractGrid {
/** /**
* Handles the RolloutChangeEvent to refresh the item in the grid. * Handles the RolloutChangeEvent to refresh the item in the grid.
* *
* @param rolloutChangeEvent * @param eventContainer
* the event which contains the rollout which has been changed * container which holds the rollout change event
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@EventBusListenerMethod(scope = EventScope.UI) @EventBusListenerMethod(scope = EventScope.UI)
@@ -258,12 +258,12 @@ public class RolloutListGrid extends AbstractGrid {
if (permissionChecker.hasRolloutUpdatePermission()) { if (permissionChecker.hasRolloutUpdatePermission()) {
getColumn(UPDATE_OPTION).setMinimumWidth(25); 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); getColumn(VAR_TOTAL_TARGETS_COUNT_STATUS).setMinimumWidth(280);
setFrozenColumnCount(getColumns().size());
} }
@Override @Override
@@ -290,7 +290,12 @@ public class RolloutListGrid extends AbstractGrid {
getColumn(UPDATE_OPTION).setHeaderCaption(i18n.get("header.action.update")); 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")); join.setText(i18n.get("header.action"));
} }

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
View File

@@ -173,8 +173,6 @@ public class RolloutGroupListGrid extends AbstractGrid {
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_THRESHOLD).setMaximumWidth(100); getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_THRESHOLD).setMaximumWidth(100);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS).setMinimumWidth(280); getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS).setMinimumWidth(280);
setFrozenColumnCount(7);
} }
@Override @Override

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java
View File

@@ -133,9 +133,6 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMaximumWidth(180); getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMaximumWidth(180);
getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMinimumWidth(50); getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMinimumWidth(50);
setFrozenColumnCount(getColumns().size());
} }
@Override @Override