From 21a36a8bce6483c6dc55acf159b370d9a083551a Mon Sep 17 00:00:00 2001 From: Shruthi Manavalli Ramanna <49945739+ramannas@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:39:21 +0200 Subject: [PATCH] Re-arranged the notification to indication user of already assigned ds (#956) Signed-off-by: Shruthi Manavalli Ramanna --- .../ui/management/TargetAssignmentOperations.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/TargetAssignmentOperations.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/TargetAssignmentOperations.java index 240cf9126..88c987a12 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/TargetAssignmentOperations.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/TargetAssignmentOperations.java @@ -124,15 +124,17 @@ public final class TargetAssignmentOperations { notification .displaySuccess(i18n.getMessage("message.target.assignment", assignmentResult.getAssigned())); } - if (assignmentResult.getAlreadyAssigned() > 0) { - notification.displaySuccess( - i18n.getMessage("message.target.alreadyAssigned", assignmentResult.getAlreadyAssigned())); - } final Set targetIds = targets.stream().map(Target::getId).collect(Collectors.toSet()); refreshPinnedDetails(dsIds, targetIds, managementUIState, eventBus, eventSource); notification.displaySuccess(i18n.getMessage("message.target.ds.assign.success")); + + if (assignmentResult.getAlreadyAssigned() > 0) { + notification.displaySuccess( + i18n.getMessage("message.target.alreadyAssigned", assignmentResult.getAlreadyAssigned())); + } + eventBus.publish(eventSource, SaveActionWindowEvent.SAVED_ASSIGNMENTS); } catch (final MultiAssignmentIsNotEnabledException e) { notification.displayValidationError(i18n.getMessage("message.target.ds.multiassign.error"));