Automatic merge from release/2.6.0 -> release/2.7.0

* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
This commit is contained in:
周有松
2019-03-07 16:57:59 +08:00
21 changed files with 41 additions and 44 deletions
+1 -1
View File
@@ -1091,7 +1091,7 @@ func (self *SImage) AllowPerformUpdateTorrentStatus(ctx context.Context, userCre
func (self *SImage) PerformUpdateTorrentStatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
formatStr, _ := query.GetString("format")
if len(formatStr) == 0 {
return nil, httperrors.NewInputParameterError("missing parameter format")
return nil, httperrors.NewMissingParameterError("format")
}
subimg := ImageSubformatManager.FetchSubImage(self.Id, formatStr)
if subimg == nil {