Added post limit warning (#26793)
* Renamed user limit API to app limit API * Added post warning limit * Added tests * Fixed types * Renamed AppLimits to ServerLimits * Fixed tests and review fixes * Updated generated code * Updated server i18n * Fixed TestCreateUserOrGuest test * Exclude deleted posts from post count for liims * Reduced limits for ease of testing * Restored original limts
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
4571c6e3a3
Коммит
b4a1b33d39
@@ -13,22 +13,22 @@ import (
|
||||
)
|
||||
|
||||
func (api *API) InitLimits() {
|
||||
api.BaseRoutes.Limits.Handle("/users", api.APISessionRequired(getUserLimits)).Methods("GET")
|
||||
api.BaseRoutes.Limits.Handle("/server", api.APISessionRequired(getServerLimits)).Methods("GET")
|
||||
}
|
||||
|
||||
func getUserLimits(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
func getServerLimits(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
if !(c.IsSystemAdmin() && c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionSysconsoleReadUserManagementUsers)) {
|
||||
c.SetPermissionError(model.PermissionSysconsoleReadUserManagementUsers)
|
||||
return
|
||||
}
|
||||
|
||||
userLimits, err := c.App.GetUserLimits()
|
||||
serverLimits, err := c.App.GetServerLimits()
|
||||
if err != nil {
|
||||
c.Err = err
|
||||
return
|
||||
}
|
||||
|
||||
if err := json.NewEncoder(w).Encode(userLimits); err != nil {
|
||||
c.Logger.Error("Error writing user limits response", mlog.Err(err))
|
||||
if err := json.NewEncoder(w).Encode(serverLimits); err != nil {
|
||||
c.Logger.Error("Error writing server limits response", mlog.Err(err))
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user