From 25b6ef31aa9a67d3e017fedac43fdc358246c8aa Mon Sep 17 00:00:00 2001 From: venu1278 Date: Wed, 3 Feb 2016 12:58:27 +0530 Subject: [PATCH 1/2] MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter Signed-off-by: venu1278 --- .../ui/management/targettag/MultipleTargetFilter.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java index a882c15d6..56c4ea909 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.ui.management.targettag; import javax.annotation.PostConstruct; +import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder; import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent; @@ -63,6 +64,9 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange @Autowired private CreateUpdateTargetTagLayout createUpdateTargetTagLayout; + @Autowired + private SpPermissionChecker permChecker; + @Autowired private ManagementUIState managementUIState; @@ -119,8 +123,10 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange simpleFilterTab = new VerticalLayout(); final VerticalLayout targetTagTableLayout = new VerticalLayout(); targetTagTableLayout.setSizeFull(); - targetTagTableLayout.addComponent(config); - targetTagTableLayout.setComponentAlignment(config, Alignment.TOP_RIGHT); + if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) { + targetTagTableLayout.addComponent(config); + targetTagTableLayout.setComponentAlignment(config, Alignment.TOP_RIGHT); + } targetTagTableLayout.addComponent(filterByButtons); targetTagTableLayout.setComponentAlignment(filterByButtons, Alignment.MIDDLE_CENTER); targetTagTableLayout.addStyleName("target-tag-drop-hint"); From 79abaa856d84248cd877f32e1ec296570a732f10 Mon Sep 17 00:00:00 2001 From: venu1278 Date: Mon, 8 Feb 2016 12:19:04 +0530 Subject: [PATCH 2/2] MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter Signed-off-by: venu1278 --- .../ui/management/targettag/MultipleTargetFilter.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java index 56c4ea909..c4393e3aa 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java @@ -89,10 +89,11 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange filterByButtons.addStyleName(SPUIStyleDefinitions.NO_TOP_BORDER); targetFilterQueryButtonsTab.init(customTargetTagFilterButtonClick); - config = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ADD_TARGET_TAG, "", "", "", true, - FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class); - config.addClickListener(event -> settingsIconClicked()); - + if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) { + config = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ADD_TARGET_TAG, "", "", "", true, + FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class); + config.addClickListener(event -> settingsIconClicked()); + } addStyleName(ValoTheme.ACCORDION_BORDERLESS); addTabs(); setSizeFull(); @@ -123,7 +124,7 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange simpleFilterTab = new VerticalLayout(); final VerticalLayout targetTagTableLayout = new VerticalLayout(); targetTagTableLayout.setSizeFull(); - if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) { + if (null != config) { targetTagTableLayout.addComponent(config); targetTagTableLayout.setComponentAlignment(config, Alignment.TOP_RIGHT); }