Skip to content

Commit

Permalink
Fix missing message property (#646)
Browse files Browse the repository at this point in the history
* Added missing message property when dragging a software module twice to
a distribution without saving.

Signed-off-by: Markus Block <markus.block@bosch-si.com>

* Added null check in case the item dragged was released not over a
distribution set to avoid a NPE.

Signed-off-by: Markus Block <markus.block@bosch-si.com>
  • Loading branch information
blomark authored and kaizimmerm committed Mar 1, 2018
1 parent 246936a commit 6fcdc54
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,9 @@ protected void onDropEventFromTable(final DragAndDropEvent event) {
final AbstractSelectTargetDetails dropData = (AbstractSelectTargetDetails) event.getTargetDetails();

final Object distItemId = dropData.getItemIdOver();
handleDropEvent(source, softwareModulesIdList, distItemId);
if (distItemId != null) {
handleDropEvent(source, softwareModulesIdList, distItemId);
}
}

@Override
Expand Down
1 change: 1 addition & 0 deletions hawkbit-ui/src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ message.software.assignment = {0} Software Module(s) Assignment(s) done
message.dist.inuse = Distribution {0} is already assigned to target
message.software.dist.already.assigned = Software Module {0} is already assigned to Distribution {1}
message.software.dist.type.notallowed = Software Module {0} cannot be assigned, because Distribution {1} does not support the Software Module Type {2}
message.software.already.dragged = Software Module {0} was already dragged to this Distribution.
message.target.assigned = {0} is assigned to {1}
message.dist.type.delete = {0} Distribution Type(s) deleted successfully.
message.sw.module.type.delete = {0} Software Module Type(s) deleted successfully.
Expand Down

0 comments on commit 6fcdc54

Please sign in to comment.