opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-zone-capabilities-conflict to release/2.1.0

Browse Source 
* commit '013262e25ffc0c57f8e832e678711868c3c9924e':
  修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability
This commit is contained in:
邱剑
2018-09-13 12:16:31 +08:00
parent f603867960 013262e25f
commit 28a662ecc8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/zones.go
+2 -2
View File
@@ -474,11 +474,11 @@ func (manager *SZoneManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
return q, nil
}
func (self *SZone) AllowGetDetailsCapabilities(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
func (self *SZone) AllowGetDetailsCapability(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
return true
}
func (self *SZone) GetDetailsCapabilities(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
func (self *SZone) GetDetailsCapability(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
capa := GetCapabilities(self)
return jsonutils.Marshal(&capa), nil
}