git commit: updated refs/heads/master to 1e0d671

[alena1108]

Repository: cloudstack
Updated Branches:
  refs/heads/master a7e267b41 -> 1e0d6716c


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

Conflicts:
        
api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e0d6716
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e0d6716
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e0d6716

Branch: refs/heads/master
Commit: 1e0d6716cae6babcc8b48ec89edbbc1aa89f6278
Parents: a7e267b
Author: Alena Prokharchyk <alena.prokharc...@citrix.com>
Authored: Thu Apr 24 14:28:31 2014 -0700
Committer: Alena Prokharchyk <alena.prokharc...@citrix.com>
Committed: Thu Apr 24 14:35:46 2014 -0700

----------------------------------------------------------------------
 .../cloudstack/api/command/user/vm/ListNicsCmd.java   |  7 +++----
 .../command/user/volume/ListResourceDetailsCmd.java   | 14 +++++++-------
 server/src/com/cloud/api/query/QueryManagerImpl.java  |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e0d6716/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.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
index 408497c..49402dc 100644
--- 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 class ListNicsCmd extends BaseListCmd {
 
 
     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;
     }
 
     /////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e0d6716/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
----------------------------------------------------------------------
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
index 0aeff0c..93dc29d 100644
--- 
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,6 +19,7 @@ package org.apache.cloudstack.api.command.user.volume;
 
 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;
@@ -26,7 +27,6 @@ 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 class ListResourceDetailsCmd extends 
BaseListProjectAndAccountResourcesCm
         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();
     }
 
     /////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e0d6716/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 7aaa4e0..a007a07 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3321,7 +3321,7 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
     @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;