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.5.0 -> release/2.6.0

Browse Source 
* commit 'a96709816cc10c81ff2440bebd2e8080518798a6':
  允许zone-list显示location字段
This commit is contained in:
邱剑
2019-01-15 17:03:26 +08:00
parent 116590a4ae a96709816c
commit bc063ae2bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/zones.go
+3 -3
View File
@@ -44,9 +44,9 @@ func init() {
type SZone struct {
db.SStatusStandaloneResourceBase
Location string `width:"256" charset:"utf8" get:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8'))
Contacts string `width:"256" charset:"utf8" get:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8'))
NameCn string `width:"256" charset:"utf8"` // = Column(VARCHAR(256, charset='utf8'))
Location string `width:"256" charset:"utf8" get:"user" list:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8'))
Contacts string `width:"256" charset:"utf8" get:"user" update:"admin"` // = Column(VARCHAR(256, charset='utf8'))
NameCn string `width:"256" charset:"utf8"` // = Column(VARCHAR(256, charset='utf8'))
// status = Column(VARCHAR(36, charset='ascii'), nullable=False, default=ZONE_DISABLE)
ManagerUri string `width:"256" charset:"ascii" list:"admin" update:"admin"` // = Column(VARCHAR(256, charset='ascii'), nullable=True)
// admin_id = Column(VARCHAR(36, charset='ascii'), nullable=False)
pkg/mcclient/modules/mod_zones.go
+1 -1
View File
@@ -6,7 +6,7 @@ var (
func init() {
Zones = NewComputeManager("zone", "zones",
[]string{"ID", "Name", "Name_CN", "Status", "Cloudregion_ID", "CloudRegion"},
[]string{"ID", "Name", "Name_CN", "Status", "Cloudregion_ID", "CloudRegion", "Location"},
[]string{"Manager_URI"})
registerCompute(&Zones)