Automatic merge from release/2.1.0 -> release/2.2.0

* commit '17c311f2ab07e1a79c81ac644a798ee04d078dd3':
  普通用户下根据zone过滤失效
This commit is contained in:
邱剑
2018-09-05 16:49:08 +08:00
+1 -1
View File
@@ -73,7 +73,7 @@ type SStorage struct {
Cmtbound float32 `nullable:"true" list:"admin" update:"admin"` // Column(Float, nullable=True)
StorageConf jsonutils.JSONObject `nullable:"true" get:"admin" update:"admin"` // = Column(JSONEncodedDict, nullable=True)
ZoneId string `width:"36" charset:"ascii" nullable:"false" list:"admin" create:"admin_required"`
ZoneId string `width:"36" charset:"ascii" nullable:"false" list:"user" create:"admin_required"`
StoragecacheId string `width:"36" charset:"ascii" nullable:"true" list:"admin" get:"admin"`
}