X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fcontroller%2FWidgetsController.java;fp=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fcontroller%2FWidgetsController.java;h=5620204f2bb382a1a69a585730bb0fc3e66ddee8;hb=500bd3b761971db9ff11d8583337799c7891185f;hp=db7039feb7da21caa04501337a11520ad267bb73;hpb=f81c0c718043517218d55908bdad0bfcada9a969;p=portal.git diff --git a/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java b/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java index db7039fe..5620204f 100644 --- a/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java +++ b/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java @@ -69,7 +69,6 @@ import org.springframework.web.bind.annotation.RestController; @EPAuditLog @RestController -@EnableAspectJAutoProxy public class WidgetsController { private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetsController.class); @@ -96,7 +95,7 @@ public class WidgetsController { } else { String getType = request.getHeader("X-Widgets-Type"); if (!getType.isEmpty() && ("managed".equals(getType) || "all".equals(getType))) { - onboardingWidgets = widgetService.getOnboardingWidgets(user, "managed".equals(getType)); + onboardingWidgets = widgetService.getOnboardingWidgets(user.getOrgUserId(), user.getId(), "managed".equals(getType)); } else { logger.debug(EELFLoggerDelegate.debugLogger, "WidgetsController.getOnboardingApps - request must contain header 'X-Widgets-Type' with 'all' or 'managed'"); @@ -167,7 +166,7 @@ public class WidgetsController { FnUser user = fnUserService.loadUserByUsername(principal.getName()); FieldsValidator fieldsValidator; - fieldsValidator = widgetService.deleteOnboardingWidget(user, widgetId); + fieldsValidator = widgetService.deleteOnboardingWidget(user.getOrgUserId(), user.getId(), widgetId); response.setStatus(fieldsValidator.getHttpStatusCode().intValue()); EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/widgets/" + widgetId, "DELETE result =",