Merge pull request #10886 from rainzm/automated-cherry-pick-of-#10885-upstream-release-3.7

Automated cherry pick of #10885: fix(region): admin update without verification
This commit is contained in:
Zexi Li
2021-04-22 16:55:36 +08:00
committed by GitHub
+4 -4
View File
@@ -809,10 +809,6 @@ func (r *SReceiver) PreUpdate(ctx context.Context, userCred mcclient.TokenCreden
if err != nil {
log.Errorf("PushCache: %v", err)
}
err = ReceiverManager.TableSpec().InsertOrUpdate(ctx, r)
if err != nil {
log.Errorf("InsertOrUpdate: %v", err)
}
// 管理后台修改联系人,如果修改或者启用手机号和邮箱,无需进行校验
allowScope := policy.PolicyManager.AllowScope(userCred, api.SERVICE_TYPE, ReceiverManager.KeywordPlural(), policy.PolicyActionCreate)
if allowScope == rbacutils.ScopeSystem {
@@ -831,6 +827,10 @@ func (r *SReceiver) PreUpdate(ctx context.Context, userCred mcclient.TokenCreden
r.VerifiedMobile = tristate.True
}
}
err = ReceiverManager.TableSpec().InsertOrUpdate(ctx, r)
if err != nil {
log.Errorf("InsertOrUpdate: %v", err)
}
}
func (r *SReceiver) PostUpdate(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) {