From 72560311a27bb957576416739cca5e71c8665980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 3 Sep 2018 17:07:51 +0200 Subject: MM-11728: Avoid Archived channels editions throught Patch (#9335) --- store/sqlstore/channel_store.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'store/sqlstore') diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index 6d0c7353f..fba37d7cb 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 } -- cgit v1.2.3-1-g7c22 From d2190527eafdae31e14ba0832dcfb79a0a1e223b Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Tue, 4 Sep 2018 15:42:43 +0200 Subject: Uncomment upgrade for 5.3.0 (#9354) * Uncomment upgrade for 5.3.0 * add missing version --- store/sqlstore/upgrade.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'store/sqlstore') diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index ab3bd202b..cd45dfcb3 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -484,9 +484,7 @@ func UpgradeDatabaseToVersion52(sqlStore SqlStore) { } func UpgradeDatabaseToVersion53(sqlStore SqlStore) { - // TODO: Uncomment following condition when version 5.3.0 is released - // if shouldPerformUpgrade(sqlStore, VERSION_5_2_0, VERSION_5_3_0) { - - // saveSchemaVersion(sqlStore, VERSION_5_3_0) - // } + if shouldPerformUpgrade(sqlStore, VERSION_5_2_0, VERSION_5_3_0) { + saveSchemaVersion(sqlStore, VERSION_5_3_0) + } } -- cgit v1.2.3-1-g7c22