diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-11-21 12:19:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 12:19:21 -0500 |
| commit | 29cfa2e64fbbfecb5c866e05f863a0c08996fc1b (patch) | |
| tree | ce1d499780c3bcb7700eba9864b6687c985bd9e0 | |
| parent | 5cf040541121bd8a87f7be4811bbb3d0ea671308 (diff) | |
| download | chat-29cfa2e64fbbfecb5c866e05f863a0c08996fc1b.tar.gz chat-29cfa2e64fbbfecb5c866e05f863a0c08996fc1b.tar.bz2 chat-29cfa2e64fbbfecb5c866e05f863a0c08996fc1b.zip | |
Clear context error on post creation when create_at is set (#4615)
| -rw-r--r-- | api/post.go | 1 | ||||
| -rw-r--r-- | webapp/client/client.jsx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/post.go b/api/post.go index 69be29134..814d4e671 100644 --- a/api/post.go +++ b/api/post.go @@ -134,6 +134,7 @@ func CreatePost(c *Context, post *model.Post, triggerWebhooks bool) (*model.Post if post.CreateAt != 0 && !HasPermissionToContext(c, model.PERMISSION_MANAGE_SYSTEM) { post.CreateAt = 0 + c.Err = nil } post.Hashtags, _ = model.ParseHashtags(post.Message) diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 90ff75059..538e82a72 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -1508,7 +1508,7 @@ export default class Client { set(this.defaultHeaders). type('application/json'). accept('application/json'). - send(post). + send({...post, create_at: 0}). end(this.handleResponse.bind(this, 'createPost', success, error)); this.track('api', 'api_posts_create', post.channel_id, 'length', post.message.length); |