[cloudstack] branch master updated: Regression Fix: Allow full response view to Admin user (#3940)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 51794de  Regression Fix: Allow full response view to Admin user (#3940)
51794de is described below

commit 51794deb62b66c065f75eab41954163421e4b87d
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Sat Mar 7 02:40:33 2020 +0530

    Regression Fix: Allow full response view to Admin user (#3940)
    
    Change Response view to Full for Admin user
    
    Co-authored-by: Pearl Dsilva <pe...@shapeblue.com>
    Co-authored-by: Rohit Yadav <ro...@shapeblue.com>
---
 server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 3da75bf..96447ae 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -1765,6 +1765,10 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         ListResponse<VolumeResponse> response = new ListResponse<VolumeResponse>();
 
         ResponseView respView = cmd.getResponseView();
+        Account account = CallContext.current().getCallingAccount();
+        if (_accountMgr.isAdmin(account.getAccountId())) {
+            respView = ResponseView.Full;
+        }
 
         List<VolumeResponse> volumeResponses = ViewResponseHelper.createVolumeResponse(respView, result.first().toArray(new VolumeJoinVO[result.first().size()]));