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

Merge branch 'master' into Feature_Improve_Code_Quality

Browse Source
This commit is contained in:
Michael Hirsch
2016-08-09 17:54:11 +02:00
parent d3edcb0044 4baf8c6ce0
commit 8c39fc98e0
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java
View File

@@ -256,6 +256,7 @@ public abstract class AbstractTagToken<T extends BaseEntity> implements Serializ
protected void removeTokenItem(final Long tokenId, final String name) { protected void removeTokenItem(final Long tokenId, final String name) {
tokenField.removeToken(tokenId); tokenField.removeToken(tokenId);
tagDetails.remove(tokenId);
setContainerPropertValues(tokenId, name, tokensAdded.get(tokenId).getColor()); setContainerPropertValues(tokenId, name, tokensAdded.get(tokenId).getColor());
} }

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java
View File

@@ -96,6 +96,7 @@ public class TargetBulkTokenTags extends AbstractTargetTagToken {
@Override @Override
protected void populateContainer() { protected void populateContainer() {
container.removeAllItems(); container.removeAllItems();
tagDetails.clear();
for (final TargetTag tag : tagManagement.findAllTargetTags()) { for (final TargetTag tag : tagManagement.findAllTargetTags()) {
setContainerPropertValues(tag.getId(), tag.getName(), tag.getColour()); setContainerPropertValues(tag.getId(), tag.getName(), tag.getColour());
} }