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

Merge pull request #11 from bsinno/MECS-1440_Target_Count_Not_displayed

Browse Source 
Tested, ok
This commit is contained in:
Kai Zimmermann
2016-01-25 11:15:04 +01:00
parent f5ae40ac17 64ad6e7790
commit aa2f26353b
5 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java
View File

@@ -150,7 +150,12 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
*/ */
@Override @Override
protected boolean hasUpdatePermission() { protected boolean hasUpdatePermission() {
return permChecker.hasUpdateDistributionPermission(); /**
* Footer layout should be displayed only when software modeule has
* delete permission.So update permission need not be checked in this
* case.
*/
return false;
} }
/* /*
@@ -361,15 +366,4 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
*/ */
} }
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
* hasReadPermission()
*/
@Override
protected boolean hasReadPermission() {
return permChecker.hasReadDistributionPermission();
}
} }

53
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/footer/AbstractDeleteActionsLayout.java
View File

@@ -54,7 +54,7 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
* Initialize. * Initialize.
*/ */
protected void init() { protected void init() {
if (hasReadPermission() || hasDeletePermission() || hasUpdatePermission() || hasBulkUploadPermission()) { if (hasCountMessage() || hasDeletePermission() || hasUpdatePermission() || hasBulkUploadPermission()) {
createComponents(); createComponents();
buildLayout(); buildLayout();
reload(); reload();
@@ -98,13 +98,16 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
hLayout.addComponent(bulkUploadStatusButton); hLayout.addComponent(bulkUploadStatusButton);
hLayout.setComponentAlignment(bulkUploadStatusButton, Alignment.BOTTOM_LEFT); hLayout.setComponentAlignment(bulkUploadStatusButton, Alignment.BOTTOM_LEFT);
} }
addComponent(dropHintLayout); if (dropHintLayout.getComponentCount() > 0) {
addComponent(hLayout); addComponent(dropHintLayout);
setComponentAlignment(dropHintLayout, Alignment.BOTTOM_CENTER); setComponentAlignment(dropHintLayout, Alignment.BOTTOM_CENTER);
setComponentAlignment(hLayout, Alignment.BOTTOM_CENTER); }
if (hLayout.getComponentCount() > 0) {
addComponent(hLayout);
setComponentAlignment(hLayout, Alignment.BOTTOM_CENTER);
}
setStyleName("footer-layout"); setStyleName("footer-layout");
setWidth("100%"); setWidth("100%");
} }
private DragAndDropWrapper createDeleteWrapperLayout() { private DragAndDropWrapper createDeleteWrapperLayout() {
@@ -155,21 +158,29 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
} }
protected void setUploadStatusButtonCaption(final Long count) { protected void setUploadStatusButtonCaption(final Long count) {
bulkUploadStatusButton.setCaption("<div class='unread'>" + count + "</div>"); if (null != bulkUploadStatusButton) {
bulkUploadStatusButton.setCaption("<div class='unread'>" + count + "</div>");
}
} }
protected void enableBulkUploadStatusButton() { protected void enableBulkUploadStatusButton() {
bulkUploadStatusButton.setVisible(true); if (null != bulkUploadStatusButton) {
bulkUploadStatusButton.setVisible(true);
}
} }
protected void updateUploadBtnIconToComplete() { protected void updateUploadBtnIconToComplete() {
bulkUploadStatusButton.removeStyleName(SPUIStyleDefinitions.BULK_UPLOAD_PROGRESS_INDICATOR_STYLE); if (null != bulkUploadStatusButton) {
bulkUploadStatusButton.setIcon(FontAwesome.UPLOAD); bulkUploadStatusButton.removeStyleName(SPUIStyleDefinitions.BULK_UPLOAD_PROGRESS_INDICATOR_STYLE);
bulkUploadStatusButton.setIcon(FontAwesome.UPLOAD);
}
} }
protected void updateUploadBtnIconToProgressIndicator() { protected void updateUploadBtnIconToProgressIndicator() {
bulkUploadStatusButton.addStyleName(SPUIStyleDefinitions.BULK_UPLOAD_PROGRESS_INDICATOR_STYLE); if (null != bulkUploadStatusButton) {
bulkUploadStatusButton.setIcon(null); bulkUploadStatusButton.addStyleName(SPUIStyleDefinitions.BULK_UPLOAD_PROGRESS_INDICATOR_STYLE);
bulkUploadStatusButton.setIcon(null);
}
} }
protected void actionButtonClicked() { protected void actionButtonClicked() {
@@ -217,10 +228,12 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
* new count value. * new count value.
*/ */
protected void updateActionsCount(final int newCount) { protected void updateActionsCount(final int newCount) {
if (newCount > 0) { if (noActionBtn != null) {
noActionBtn.setCaption(getActionsButtonLabel() + "<div class='unread'>" + newCount + "</div>"); if (newCount > 0) {
} else { noActionBtn.setCaption(getActionsButtonLabel() + "<div class='unread'>" + newCount + "</div>");
noActionBtn.setCaption(getNoActionsButtonLabel()); } else {
noActionBtn.setCaption(getNoActionsButtonLabel());
}
} }
} }
@@ -243,8 +256,10 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
} }
protected void hideBulkUploadStatusButton() { protected void hideBulkUploadStatusButton() {
bulkUploadStatusButton.setCaption(null); if (null != bulkUploadStatusButton) {
bulkUploadStatusButton.setVisible(false); bulkUploadStatusButton.setCaption(null);
bulkUploadStatusButton.setVisible(false);
}
} }
/** /**
@@ -358,6 +373,4 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
protected abstract void showBulkUploadWindow(); protected abstract void showBulkUploadWindow();
protected abstract boolean hasReadPermission();
} }

10
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java
View File

@@ -541,14 +541,4 @@ public class DSDeleteActionsLayout extends AbstractDeleteActionsLayout {
return getCurrentDistributionSetType() != null && getCurrentDistributionSetType().getName().equals(dsTypeName); return getCurrentDistributionSetType() != null && getCurrentDistributionSetType().getName().equals(dsTypeName);
} }
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
* hasReadPermission()
*/
@Override
protected boolean hasReadPermission() {
return permChecker.hasReadDistributionPermission();
}
} }

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

@@ -206,13 +206,18 @@ public class DeploymentView extends VerticalLayout implements View, BrowserWindo
} }
private Boolean showFooterLayout() { private Boolean showFooterLayout() {
if ((permChecker.hasDeleteDistributionPermission() || permChecker.hasDeleteTargetPermission()) if (permChecker.hasTargetReadPermission()
|| (permChecker.hasReadDistributionPermission() && permChecker.hasUpdateTargetPermission())) { || (permChecker.hasDeleteDistributionPermission() || permChecker.hasDeleteTargetPermission())
|| hasDeploymentPermission()) {
return true; return true;
} }
return false; return false;
} }
private boolean hasDeploymentPermission() {
return permChecker.hasReadDistributionPermission() && permChecker.hasUpdateTargetPermission();
}
private void displayTargetWidgetsOnly() { private void displayTargetWidgetsOnly() {
mainLayout.setColumns(3); mainLayout.setColumns(3);
mainLayout.setRows(2); mainLayout.setRows(2);

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java
View File

@@ -193,7 +193,7 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
*/ */
@Override @Override
protected boolean hasUpdatePermission() { protected boolean hasUpdatePermission() {
return permChecker.hasUpdateDistributionPermission() || permChecker.hasUpdateTargetPermission(); return permChecker.hasUpdateTargetPermission() && permChecker.hasReadDistributionPermission();
} }
/* /*
@@ -377,7 +377,7 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
*/ */
@Override @Override
protected boolean hasCountMessage() { protected boolean hasCountMessage() {
return true; return permChecker.hasTargetReadPermission();
} }
/* /*
@@ -589,9 +589,4 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
} }
} }
@Override
protected boolean hasReadPermission() {
return permChecker.hasTargetReadPermission();
}
} }