diff --git a/pkg/cloudcommon/db/resourcebase.go b/pkg/cloudcommon/db/resourcebase.go index a2a20413cc..3b9a716c7f 100644 --- a/pkg/cloudcommon/db/resourcebase.go +++ b/pkg/cloudcommon/db/resourcebase.go @@ -39,9 +39,9 @@ type SResourceBase struct { // 资源被更新次数 UpdateVersion int `default:"0" nullable:"false" auto_version:"true" list:"user" json:"update_version"` // 资源删除时间 - DeletedAt time.Time `json:"deleted_at" list:"admin"` + DeletedAt time.Time `json:"deleted_at" list:"user"` // 资源是否被删除 - Deleted bool `nullable:"false" default:"false" json:"deleted" list:"admin"` + Deleted bool `nullable:"false" default:"false" json:"deleted" list:"user"` } type SResourceBaseManager struct { diff --git a/pkg/mcclient/options/base.go b/pkg/mcclient/options/base.go index 5903d2b461..ec77251196 100644 --- a/pkg/mcclient/options/base.go +++ b/pkg/mcclient/options/base.go @@ -239,6 +239,8 @@ type BaseListOptions struct { PagingMarker string `help:"Marker for pagination" json:"paging_marker"` OrderByTag string `help:"Order results by tag values, composed by a tag key and order, e.g user:部门:ASC"` + + Delete string `help:"show deleted records"` } func (opts *BaseListOptions) addTag(prefix, tag string, idx int, params *jsonutils.JSONDict) error {