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

Fixed edit DS bug

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
kaizimmerm
2016-11-29 16:30:37 +01:00
parent 8d9f2d7dfa
commit 99c6e6ff1f
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
View File

@@ -127,7 +127,7 @@ public class DeploymentView extends VerticalLayout implements View, BrowserWindo
managementViewAcceptCriteria); managementViewAcceptCriteria);
this.distributionTableLayoutNew = new DistributionTableLayout(i18n, eventBus, permChecker, managementUIState, this.distributionTableLayoutNew = new DistributionTableLayout(i18n, eventBus, permChecker, managementUIState,
distributionSetManagement, managementViewAcceptCriteria, entityFactory, uiNotification, tagManagement, distributionSetManagement, managementViewAcceptCriteria, entityFactory, uiNotification, tagManagement,
targetManagement); systemManagement, targetManagement);
this.deleteAndActionsLayout = new DeleteActionsLayout(i18n, permChecker, eventBus, uiNotification, this.deleteAndActionsLayout = new DeleteActionsLayout(i18n, permChecker, eventBus, uiNotification,
tagManagement, managementViewAcceptCriteria, managementUIState, targetManagement, targetTable, tagManagement, managementViewAcceptCriteria, managementUIState, targetManagement, targetTable,
deploymentManagement, distributionSetManagement); deploymentManagement, distributionSetManagement);

13
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
View File

@@ -11,6 +11,7 @@ package org.eclipse.hawkbit.ui.management.dstable;
import org.eclipse.hawkbit.repository.DistributionSetManagement; import org.eclipse.hawkbit.repository.DistributionSetManagement;
import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.EntityFactory;
import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.repository.SpPermissionChecker;
import org.eclipse.hawkbit.repository.SystemManagement;
import org.eclipse.hawkbit.repository.TagManagement; import org.eclipse.hawkbit.repository.TagManagement;
import org.eclipse.hawkbit.repository.TargetManagement; import org.eclipse.hawkbit.repository.TargetManagement;
import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout;
@@ -33,7 +34,10 @@ public class DistributionTableLayout extends AbstractTableLayout {
final DistributionSetManagement distributionSetManagement, final DistributionSetManagement distributionSetManagement,
final ManagementViewAcceptCriteria managementViewAcceptCriteria, final EntityFactory entityFactory, final ManagementViewAcceptCriteria managementViewAcceptCriteria, final EntityFactory entityFactory,
final UINotification notification, final TagManagement tagManagement, final UINotification notification, final TagManagement tagManagement,
final TargetManagement targetService) { final SystemManagement systemManagement, final TargetManagement targetService) {
final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout = new DistributionAddUpdateWindowLayout(
i18n, notification, eventBus, distributionSetManagement, systemManagement, entityFactory, null);
final DsMetadataPopupLayout dsMetadataPopupLayout = new DsMetadataPopupLayout(i18n, notification, eventBus, final DsMetadataPopupLayout dsMetadataPopupLayout = new DsMetadataPopupLayout(i18n, notification, eventBus,
distributionSetManagement, entityFactory, permissionChecker); distributionSetManagement, entityFactory, permissionChecker);
@@ -42,10 +46,13 @@ public class DistributionTableLayout extends AbstractTableLayout {
notification, managementUIState, managementViewAcceptCriteria, targetService, dsMetadataPopupLayout, notification, managementUIState, managementViewAcceptCriteria, targetService, dsMetadataPopupLayout,
distributionSetManagement); distributionSetManagement);
super.init(new DistributionTableHeader(i18n, permissionChecker, eventBus, managementUIState, null), super.init(
new DistributionTableHeader(i18n, permissionChecker, eventBus, managementUIState,
distributionAddUpdateWindowLayout),
distributionTable, distributionTable,
new DistributionDetails(i18n, eventBus, permissionChecker, managementUIState, distributionSetManagement, new DistributionDetails(i18n, eventBus, permissionChecker, managementUIState, distributionSetManagement,
dsMetadataPopupLayout, entityFactory, notification, tagManagement, null)); dsMetadataPopupLayout, entityFactory, notification, tagManagement,
distributionAddUpdateWindowLayout));
} }
} }