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.1.0 -> release/2.2.0

Browse Source 
* commit '183e1ec0abcaef9eb7dd3ad8e4c753ea8f62a784':
  cloudcommon: resourcebase: add UpdateVersion to list columns
  cloudcommon: statusstandalone: allow specifying status on creation
This commit is contained in:
邱剑
2018-09-17 10:51:42 +08:00
parent 18068b0c1e 183e1ec0ab
commit d2a305f836
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/resourcebase.go
+1 -1
View File
@@ -14,7 +14,7 @@ type SResourceBase struct {
CreatedAt time.Time `nullable:"false" created_at:"true" get:"user"`
UpdatedAt time.Time `nullable:"false" updated_at:"true" list:"user"`
UpdateVersion int `default:"0" nullable:"false" auto_version:"true"`
UpdateVersion int `default:"0" nullable:"false" auto_version:"true" list:"user"`
DeletedAt time.Time ``
Deleted bool `nullable:"false" default:"false"`
}
pkg/cloudcommon/db/statusstandalone.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
type SStatusStandaloneResourceBase struct {
SStandaloneResourceBase
Status string `width:"36" charset:"ascii" nullable:"false" default:"init" list:"user"`
Status string `width:"36" charset:"ascii" nullable:"false" default:"init" list:"user" create:"optional"`
}
type SStatusStandaloneResourceBaseManager struct {