From 8cb9998c835221d527572d76753a587886df0fa4 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 6 Oct 2015 14:11:46 +0200 Subject: [PATCH] SONAR-6834 Fix location of showBackgroundTasks in response of api/navigation/component --- .../org/sonar/server/ui/ws/ComponentNavigationAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java index 6fcfa27eb6a..9847442329f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java @@ -140,7 +140,6 @@ public class ComponentNavigationAction implements NavigationWsAction { .prop("name", component.name()) .prop("isComparable", componentTypeHasProperty(component, PROPERTY_COMPARABLE)) .prop("canBeFavorite", userSession.isLoggedIn()) - .prop("showBackgroundTasks", ActivityWsAction.isAllowedOnComponentUuid(userSession, component.uuid())) .prop("isFavorite", isFavourite(session, component, userSession)); List dashboards = activeDashboardDao.selectProjectDashboardsForUserLogin(session, userSession.getLogin()); @@ -200,7 +199,7 @@ public class ComponentNavigationAction implements NavigationWsAction { return componentKey; } - private void writeDashboards(JsonWriter json, List dashboards) { + private static void writeDashboards(JsonWriter json, List dashboards) { json.name("dashboards").beginArray(); for (DashboardDto dashboard : dashboards) { json.beginObject() @@ -242,6 +241,7 @@ public class ComponentNavigationAction implements NavigationWsAction { json.prop("showHistory", isAdmin && componentTypeHasProperty(component, PROPERTY_MODIFIABLE_HISTORY)); json.prop("showUpdateKey", isAdmin && componentTypeHasProperty(component, PROPERTY_UPDATABLE_KEY)); json.prop("showDeletion", isAdmin && componentTypeHasProperty(component, PROPERTY_DELETABLE)); + json.prop("showBackgroundTasks", ActivityWsAction.isAllowedOnComponentUuid(userSession, component.uuid())); } private boolean componentTypeHasProperty(ComponentDto component, String resourceTypeProperty) { -- 2.39.5