CLOUDSTACK-6436: listResourceDetails - don't return entries set with display=false, by default

Alena Prokharchyk · Alena Prokharchyk · commit 1e0d6716cae6 · 2014-04-24T14:35:46.000-07:00
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
@@ -99,11 +99,10 @@ public long getEntityOwnerId() {
 
 
     public Boolean getDisplay() {
-        Account caller = CallContext.current().getCallingAccount();
-        if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
-            return true;
+        if (display != null) {
+            return display;
         }
-        return display;
+        return true;
     }
 
     /////////////////////////////////////////////////////
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
@@ -19,14 +19,14 @@
 
 import java.util.List;
 
+import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ResourceDetailResponse;
 import org.apache.cloudstack.api.response.ResourceTagResponse;
-import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.server.ResourceTag;
 
@@ -45,7 +45,7 @@ public class ListResourceDetailsCmd extends BaseListProjectAndAccountResourcesCm
     private String key;
 
     @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "if set to true, only details marked with display=true, are returned."
-        + " Always false is the call is made by the regular user", since = "4.3")
+            + " False by default", since = "4.3", authorized = { RoleType.Admin })
     private Boolean forDisplay;
 
     public String getResourceId() {
@@ -61,12 +61,12 @@ public String getCommandName() {
         return s_name;
     }
 
-    public Boolean forDisplay() {
-        if (!_accountService.isAdmin(CallContext.current().getCallingAccount().getType())) {
-            return true;
+    @Override
+    public Boolean getDisplay() {
+        if (forDisplay != null) {
+            return forDisplay;
         }
-
-        return forDisplay;
+        return super.getDisplay();
     }
 
     /////////////////////////////////////////////////////
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3321,7 +3321,7 @@ private List<AffinityGroupJoinVO> listDomainLevelAffinityGroups(SearchCriteria<A
     @Override
     public List<ResourceDetailResponse> listResourceDetails(ListResourceDetailsCmd cmd) {
         String key = cmd.getKey();
-        Boolean forDisplay = cmd.forDisplay();
+        Boolean forDisplay = cmd.getDisplay();
         ResourceTag.ResourceObjectType resourceType = cmd.getResourceType();
         String resourceIdStr = cmd.getResourceId();
         Long resourceId = null;

Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,10 @@ public long getEntityOwnerId() {`
`99`	`99`
`100`	`100`
`101`	`101`	`public Boolean getDisplay() {`
`102`		`- Account caller = CallContext.current().getCallingAccount();`
`103`		`- if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {`
`104`		`- return true;`
	`102`	`+ if (display != null) {`
	`103`	`+ return display;`
`105`	`104`	`}`
`106`		`- return display;`
	`105`	`+ return true;`
`107`	`106`	`}`
`108`	`107`
`109`	`108`	`/////////////////////////////////////////////////////`