[MM-44307] On Limits Change, archive or restore teams according to the limits (#20247)
Automatic Merge
Этот коммит содержится в:
@@ -227,10 +227,10 @@ func (s SqlTeamStore) Save(team *model.Team) (*model.Team, error) {
|
||||
|
||||
if _, err := s.GetMasterX().NamedExec(`INSERT INTO Teams
|
||||
(Id, CreateAt, UpdateAt, DeleteAt, DisplayName, Name, Description, Email, Type, CompanyName, AllowedDomains,
|
||||
InviteId, AllowOpenInvite, LastTeamIconUpdate, SchemeId, GroupConstrained)
|
||||
InviteId, AllowOpenInvite, LastTeamIconUpdate, SchemeId, GroupConstrained, CloudLimitsArchived)
|
||||
VALUES
|
||||
(:Id, :CreateAt, :UpdateAt, :DeleteAt, :DisplayName, :Name, :Description, :Email, :Type, :CompanyName, :AllowedDomains,
|
||||
:InviteId, :AllowOpenInvite, :LastTeamIconUpdate, :SchemeId, :GroupConstrained)`, team); err != nil {
|
||||
:InviteId, :AllowOpenInvite, :LastTeamIconUpdate, :SchemeId, :GroupConstrained, :CloudLimitsArchived)`, team); err != nil {
|
||||
if IsUniqueConstraintError(err, []string{"Name", "teams_name_key"}) {
|
||||
return nil, store.NewErrInvalidInput("Team", "id", team.Id)
|
||||
}
|
||||
@@ -268,7 +268,7 @@ func (s SqlTeamStore) Update(team *model.Team) (*model.Team, error) {
|
||||
SET CreateAt=:CreateAt, UpdateAt=:UpdateAt, DeleteAt=:DeleteAt, DisplayName=:DisplayName, Name=:Name,
|
||||
Description=:Description, Email=:Email, Type=:Type, CompanyName=:CompanyName, AllowedDomains=:AllowedDomains,
|
||||
InviteId=:InviteId, AllowOpenInvite=:AllowOpenInvite, LastTeamIconUpdate=:LastTeamIconUpdate,
|
||||
SchemeId=:SchemeId, GroupConstrained=:GroupConstrained
|
||||
SchemeId=:SchemeId, GroupConstrained=:GroupConstrained, CloudLimitsArchived=:CloudLimitsArchived
|
||||
WHERE Id=:Id`, team)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to update Team with id=%s", team.Id)
|
||||
|
||||
Ссылка в новой задаче
Block a user