return error if option not set instead of soft delete (#15030)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
93a537a636
Коммит
fe45e0a98b
@@ -18,7 +18,7 @@ func (api *API) InitTeamLocal() {
|
||||
|
||||
api.BaseRoutes.Team.Handle("", api.ApiLocal(getTeam)).Methods("GET")
|
||||
api.BaseRoutes.Team.Handle("", api.ApiLocal(updateTeam)).Methods("PUT")
|
||||
api.BaseRoutes.Team.Handle("", api.ApiLocal(deleteTeam)).Methods("DELETE")
|
||||
api.BaseRoutes.Team.Handle("", api.ApiLocal(localDeleteTeam)).Methods("DELETE")
|
||||
api.BaseRoutes.Team.Handle("/invite/email", api.ApiLocal(localInviteUsersToTeam)).Methods("POST")
|
||||
api.BaseRoutes.Team.Handle("/patch", api.ApiLocal(patchTeam)).Methods("PUT")
|
||||
|
||||
@@ -27,6 +27,35 @@ func (api *API) InitTeamLocal() {
|
||||
api.BaseRoutes.TeamMember.Handle("", api.ApiLocal(removeTeamMember)).Methods("DELETE")
|
||||
}
|
||||
|
||||
func localDeleteTeam(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
c.RequireTeamId()
|
||||
if c.Err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
auditRec := c.MakeAuditRecord("localDeleteTeam", audit.Fail)
|
||||
defer c.LogAuditRec(auditRec)
|
||||
|
||||
if team, err := c.App.GetTeam(c.Params.TeamId); err == nil {
|
||||
auditRec.AddMeta("team", team)
|
||||
}
|
||||
|
||||
var err *model.AppError
|
||||
if c.Params.Permanent {
|
||||
err = c.App.PermanentDeleteTeamId(c.Params.TeamId)
|
||||
} else {
|
||||
err = c.App.SoftDeleteTeam(c.Params.TeamId)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
c.Err = err
|
||||
return
|
||||
}
|
||||
|
||||
auditRec.Success()
|
||||
ReturnStatusOK(w)
|
||||
}
|
||||
|
||||
func localInviteUsersToTeam(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
c.RequireTeamId()
|
||||
if c.Err != nil {
|
||||
|
||||
Ссылка в новой задаче
Block a user