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

Merge remote-tracking branch 'refs/remotes/eclipse/master'

Browse Source
This commit is contained in:
Michael Hirsch
2016-02-09 14:51:58 +01:00
parent d24e269e13 5088b7fd9b
commit 81bf2df2d8
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java
View File

@@ -10,6 +10,7 @@ package org.eclipse.hawkbit.ui.management.targettag;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.eclipse.hawkbit.repository.SpPermissionChecker;
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder; import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent; import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
@@ -63,6 +64,9 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange
@Autowired @Autowired
private CreateUpdateTargetTagLayout createUpdateTargetTagLayout; private CreateUpdateTargetTagLayout createUpdateTargetTagLayout;
@Autowired
private SpPermissionChecker permChecker;
@Autowired @Autowired
private ManagementUIState managementUIState; private ManagementUIState managementUIState;
@@ -85,10 +89,11 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange
filterByButtons.addStyleName(SPUIStyleDefinitions.NO_TOP_BORDER); filterByButtons.addStyleName(SPUIStyleDefinitions.NO_TOP_BORDER);
targetFilterQueryButtonsTab.init(customTargetTagFilterButtonClick); targetFilterQueryButtonsTab.init(customTargetTagFilterButtonClick);
config = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ADD_TARGET_TAG, "", "", "", true, if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) {
FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class); config = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ADD_TARGET_TAG, "", "", "", true,
config.addClickListener(event -> settingsIconClicked()); FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class);
config.addClickListener(event -> settingsIconClicked());
}
addStyleName(ValoTheme.ACCORDION_BORDERLESS); addStyleName(ValoTheme.ACCORDION_BORDERLESS);
addTabs(); addTabs();
setSizeFull(); setSizeFull();
@@ -119,8 +124,10 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange
simpleFilterTab = new VerticalLayout(); simpleFilterTab = new VerticalLayout();
final VerticalLayout targetTagTableLayout = new VerticalLayout(); final VerticalLayout targetTagTableLayout = new VerticalLayout();
targetTagTableLayout.setSizeFull(); targetTagTableLayout.setSizeFull();
targetTagTableLayout.addComponent(config); if (null != config) {
targetTagTableLayout.setComponentAlignment(config, Alignment.TOP_RIGHT); targetTagTableLayout.addComponent(config);
targetTagTableLayout.setComponentAlignment(config, Alignment.TOP_RIGHT);
}
targetTagTableLayout.addComponent(filterByButtons); targetTagTableLayout.addComponent(filterByButtons);
targetTagTableLayout.setComponentAlignment(filterByButtons, Alignment.MIDDLE_CENTER); targetTagTableLayout.setComponentAlignment(filterByButtons, Alignment.MIDDLE_CENTER);
targetTagTableLayout.addStyleName("target-tag-drop-hint"); targetTagTableLayout.addStyleName("target-tag-drop-hint");