diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-02-09 16:31:01 +0100 |
|---|---|---|
| committer | Martin Kraft <mkraft@users.noreply.github.com> | 2018-02-09 10:31:01 -0500 |
| commit | 0aa7ecd5e89f054ae927b246f2aec4bd6348d42b (patch) | |
| tree | 1944001594c05731acfb998fc3840d2de456e511 /app/post.go | |
| parent | 96ffde43dc5dccef7af106dc8200566ff16ba1dc (diff) | |
| download | chat-0aa7ecd5e89f054ae927b246f2aec4bd6348d42b.tar.gz chat-0aa7ecd5e89f054ae927b246f2aec4bd6348d42b.tar.bz2 chat-0aa7ecd5e89f054ae927b246f2aec4bd6348d42b.zip | |
AllowEditPost and PostEditTimeLimit migration (#8208)
* AllowEditPost and PostEditTimeLimit migration
* Not set EDIT_POST permission to sysadmin_role if ALLOW_EDIT_POST is configured to NEVER
* Remove a bit of code duplication
Diffstat (limited to 'app/post.go')
| -rw-r--r-- | app/post.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/post.go b/app/post.go index 01abb21cf..843319082 100644 --- a/app/post.go +++ b/app/post.go @@ -332,13 +332,6 @@ func (a *App) UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model } else { oldPost = result.Data.(*model.PostList).Posts[post.Id] - if a.License() != nil { - if *a.Config().ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_NEVER && post.Message != oldPost.Message { - err := model.NewAppError("UpdatePost", "api.post.update_post.permissions_denied.app_error", nil, "", http.StatusForbidden) - return nil, err - } - } - if oldPost == nil { err := model.NewAppError("UpdatePost", "api.post.update_post.find.app_error", nil, "id="+post.Id, http.StatusBadRequest) return nil, err @@ -355,7 +348,7 @@ func (a *App) UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model } if a.License() != nil { - if *a.Config().ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_TIME_LIMIT && model.GetMillis() > oldPost.CreateAt+int64(*a.Config().ServiceSettings.PostEditTimeLimit*1000) && post.Message != oldPost.Message { + if *a.Config().ServiceSettings.PostEditTimeLimit != -1 && model.GetMillis() > oldPost.CreateAt+int64(*a.Config().ServiceSettings.PostEditTimeLimit*1000) && post.Message != oldPost.Message { err := model.NewAppError("UpdatePost", "api.post.update_post.permissions_time_limit.app_error", map[string]interface{}{"timeLimit": *a.Config().ServiceSettings.PostEditTimeLimit}, "", http.StatusBadRequest) return nil, err } |