From 0244c1ded1c09f3770e961f1ff755d1313014b07 Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Fri, 15 Jul 2016 13:34:39 +0200 Subject: [PATCH] Force quit is disabled if action is not forced but is canceled Signed-off-by: Melanie Retter --- .../ui/management/actionhistory/ActionHistoryTable.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java index 503ec83c7..ffc7d1e3a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java @@ -414,7 +414,8 @@ public class ActionHistoryTable extends TreeTable { final Button actionForce = SPUIComponentProvider.getButton( SPUIComponentIdProvider.ACTION_HISTORY_TABLE_FORCE_ID, "", i18n.get("message.force.action"), ValoTheme.BUTTON_TINY, true, FontAwesome.BOLT, SPUIButtonStyleSmallNoBorder.class); - actionForce.setEnabled(isActionActive && !actionWithActiveStatus.isForce()); + actionForce.setEnabled( + isActionActive && !actionWithActiveStatus.isForce() && !actionWithActiveStatus.isCancelingOrCanceled()); actionForce.addClickListener(event -> confirmAndForceAction(actionId)); final Button actionForceQuit = SPUIComponentProvider.getButton(