opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.0.0 -> release/2.1.0

Browse Source 
* commit '4077ebbc858031df632216d2812d6245d5c59011':
  普通用户创建云盘时，需要storage-list权限
This commit is contained in:
邱剑
2018-08-27 22:22:26 +08:00
parent f7c0a84a12 4077ebbc85
commit fdbe0df810
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/storages.go
+4
View File
@@ -101,6 +101,10 @@ func (self *SStorage) IsLocal() bool {
return self.StorageType == STORAGE_LOCAL || self.StorageType == STORAGE_BAREMETAL
}
func (manager *SStorageManager) AllowListItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
return true
}
func (self *SStorage) GetUsedCapacity(isReady tristate.TriState) int {
disks := DiskManager.Query().SubQuery()
q := disks.Query(sqlchemy.SUM("sum", disks.Field("disk_size"))).Equals("storage_id", self.Id)