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

Added permission check for create/update metadata

Browse Source 
Added 'cancel' button in metadata popup
Added show 'metadata' icon next to 'edit' icon

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java

Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
This commit is contained in:
AMU7KOR
2016-06-23 15:40:29 +05:30
committed by Kai Zimmermann
parent a53a6c9f0c
commit e5d4e7c560
6 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
View File

@@ -189,7 +189,9 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID; return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
} }
private void populateMetadataDetails(){
@Override
protected void populateMetadataDetails(){
swmMetadataTable.populateSMMetadata(getSelectedBaseEntity()); swmMetadataTable.populateSMMetadata(getSelectedBaseEntity());
} }
@@ -215,8 +217,9 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
@Override @Override
protected void showMetadata(ClickEvent event) { protected void showMetadata(ClickEvent event) {
UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null)); SoftwareModule swmodule = softwareManagement.findSoftwareModuleWithDetails(getSelectedBaseEntityId());
/* display the window */
UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(swmodule,null));
} }
} }

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
View File

@@ -221,6 +221,7 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
populateLog(); populateLog();
populateDescription(); populateDescription();
populateDetailsWidget(); populateDetailsWidget();
populateMetadataDetails();
} }
protected void populateLog() { protected void populateLog() {
@@ -340,6 +341,8 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
protected abstract void populateDetailsWidget(); protected abstract void populateDetailsWidget();
protected abstract void populateMetadataDetails();
protected Long getSelectedBaseEntityId() { protected Long getSelectedBaseEntityId() {
return selectedBaseEntity == null ? null : selectedBaseEntity.getId(); return selectedBaseEntity == null ? null : selectedBaseEntity.getId();
} }

11
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
View File

@@ -272,7 +272,8 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
} }
} }
private void populateMetadataDetails(){ @Override
protected void populateMetadataDetails(){
dsMetadataTable.populateDSMetadata(getSelectedBaseEntity()); dsMetadataTable.populateDSMetadata(getSelectedBaseEntity());
} }
@@ -404,6 +405,11 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
return true; return true;
} }
@Override
protected Boolean isMetadataIconToBeDisplayed() {
return true;
}
@Override @Override
protected String getShowMetadataButtonId() { protected String getShowMetadataButtonId() {
DistributionSetIdName lastselectedDistDS = manageDistUIState.getLastSelectedDistribution().isPresent() ? manageDistUIState DistributionSetIdName lastselectedDistDS = manageDistUIState.getLastSelectedDistribution().isPresent() ? manageDistUIState
@@ -422,6 +428,7 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
@Override @Override
protected void showMetadata(ClickEvent event) { protected void showMetadata(ClickEvent event) {
UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null)); DistributionSet ds = distributionSetManagement.findDistributionSetByIdWithDetails(getSelectedBaseEntityId());
UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds,null));
} }
} }

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
View File

@@ -197,7 +197,8 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID; return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
} }
private void populateMetadataDetails() { @Override
protected void populateMetadataDetails() {
swmMetadataTable.populateSMMetadata(getSelectedBaseEntity()); swmMetadataTable.populateSMMetadata(getSelectedBaseEntity());
} }
@@ -222,6 +223,7 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
@Override @Override
protected void showMetadata(ClickEvent event) { protected void showMetadata(ClickEvent event) {
UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null)); SoftwareModule swmodule = softwareManagement.findSoftwareModuleWithDetails(getSelectedBaseEntityId());
UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(swmodule, null));
} }
} }

7
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
View File

@@ -158,7 +158,9 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
} }
private void populateMetadataDetails(){
@Override
protected void populateMetadataDetails(){
dsMetadataTable.populateDSMetadata(getSelectedBaseEntity()); dsMetadataTable.populateDSMetadata(getSelectedBaseEntity());
} }
@@ -227,7 +229,8 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
@Override @Override
protected void showMetadata(ClickEvent event) { protected void showMetadata(ClickEvent event) {
UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null)); DistributionSet ds = distributionSetManagement.findDistributionSetByIdWithDetails(getSelectedBaseEntityId());
UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds,null));
} }
} }

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java
View File

@@ -263,4 +263,9 @@ public class TargetDetails extends AbstractTableDetailsLayout<Target> {
//No implementation required //No implementation required
} }
@Override
protected void populateMetadataDetails() {
//No implementation required
}
} }