diff options
| author | cpanato <ctadeu@gmail.com> | 2018-09-04 23:27:39 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-09-04 23:27:39 +0200 |
| commit | 4cf6913c1c58847b69bd7a16f046d4bfc676bdb4 (patch) | |
| tree | dbad14ece2033e395eb8f93920ce7256da803f35 /store/sqlstore/channel_store.go | |
| parent | 50af3a19a2817097355df9fd70c0fda0328d8bae (diff) | |
| parent | d2190527eafdae31e14ba0832dcfb79a0a1e223b (diff) | |
| download | chat-4cf6913c1c58847b69bd7a16f046d4bfc676bdb4.tar.gz chat-4cf6913c1c58847b69bd7a16f046d4bfc676bdb4.tar.bz2 chat-4cf6913c1c58847b69bd7a16f046d4bfc676bdb4.zip | |
Merge remote-tracking branch 'upstream/release-5.3' into release-5.3-daily-merge-20180904
Diffstat (limited to 'store/sqlstore/channel_store.go')
| -rw-r--r-- | store/sqlstore/channel_store.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index a09c00082..1b5ae7ff7 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -463,6 +463,11 @@ func (s SqlChannelStore) Update(channel *model.Channel) store.StoreChannel { return store.Do(func(result *store.StoreResult) { channel.PreUpdate() + if channel.DeleteAt != 0 { + result.Err = model.NewAppError("SqlChannelStore.Update", "store.sql_channel.update.archived_channel.app_error", nil, "", http.StatusBadRequest) + return + } + if result.Err = channel.IsValid(); result.Err != nil { return } |