gCubeSystem
/
accounting-dashboard
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

ref 18291: Modify the Accounting Dashboard portlet to support the Core 

Services Category per gateway

https://support.d4science.org/issues/18291

Fixed infra nodes scope
This commit is contained in:
Giancarlo Panichi 2020-01-21 18:57:27 +01:00
parent b8f99d099e
commit 58ccefa0b7
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/gcube/portlets/user/accountingdashboard/server/accounting/PortalContextTreeProvider.java
View File

@ -110,8 +110,11 @@ public class PortalContextTreeProvider implements ContextTreeProvider {
currUser);
if (infraNode != null) {
String gatewayScope = String.valueOf(gCubeGroup.getGroupId());
ScopeDescriptor infraNodeScopeDescriptor = createRelativeInfraNode(infraNode, gatewayScope);
StringBuilder gatewayScope=new StringBuilder();
gatewayScope.append(infrastructureScope);
gatewayScope.append("/");
gatewayScope.append(gCubeGroup.getGroupName());
ScopeDescriptor infraNodeScopeDescriptor = createRelativeInfraNode(infraNode, gatewayScope.toString());
if (gatewayChildren != null) {
gatewayChildren.addFirst(infraNodeScopeDescriptor);
} else {
@ -152,20 +155,26 @@ public class PortalContextTreeProvider implements ContextTreeProvider {
throws Exception, PortalException, SystemException {
ScopeDescriptor root;
long currentSiteGroupId = getSiteFromServletRequest(request).getGroupId();
Group group=getSiteFromServletRequest(request);
long currentSiteGroupId = group.getGroupId();
String gatewayName=group.getName();
PortalContext pContext = PortalContext.getConfiguration();
GCubeUser currUser = pContext.getCurrentUser(request);
String portalScope = pContext.getCurrentScope(currentSiteGroupId + "");
String gatewayScope = String.valueOf(currentSiteGroupId);
StringBuilder gatewayScope=new StringBuilder();
gatewayScope.append(portalScope);
gatewayScope.append("/");
gatewayScope.append(gatewayName);
InfraNode infraNode = BuildInfraNode.build(portalScope);
LinkedList<ScopeDescriptor> rootChildren = null;
rootChildren = retrieveGatewayChildren(request, currentSiteGroupId, currUser);
if (infraNode != null) {
ScopeDescriptor infraNodeScopeDescriptor = createRelativeInfraNode(infraNode, gatewayScope);
ScopeDescriptor infraNodeScopeDescriptor = createRelativeInfraNode(infraNode, gatewayScope.toString());
if (rootChildren != null) {
rootChildren.addFirst(infraNodeScopeDescriptor);
} else {