From da124f018dbb10a41f4d4b5ecb4818baf628e940 Mon Sep 17 00:00:00 2001 From: Chris Duarte Date: Mon, 23 Jul 2018 08:18:24 -0700 Subject: Add ExperimentalSidebarPreference in the config (#9013) * Add ExperimentalSidebarPreference in the config * Override Sidebar preference based on GroupUnread settings * Rename to ExperimentalChannelOrganization * Add Sidebar config in diagnostics * Fix diagnostics for experimental_channel_organization --- utils/config.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'utils/config.go') diff --git a/utils/config.go b/utils/config.go index f8cc6ec75..0a20c1723 100644 --- a/utils/config.go +++ b/utils/config.go @@ -533,6 +533,13 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["EnableTutorial"] = strconv.FormatBool(*c.ServiceSettings.EnableTutorial) props["ExperimentalEnableDefaultChannelLeaveJoinMessages"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages) props["ExperimentalGroupUnreadChannels"] = *c.ServiceSettings.ExperimentalGroupUnreadChannels + + if *c.ServiceSettings.ExperimentalChannelOrganization || *c.ServiceSettings.ExperimentalGroupUnreadChannels != model.GROUP_UNREAD_CHANNELS_DISABLED { + props["ExperimentalChannelOrganization"] = strconv.FormatBool(true) + } else { + props["ExperimentalChannelOrganization"] = strconv.FormatBool(false) + } + props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies) props["ExperimentalTimezone"] = strconv.FormatBool(*c.DisplaySettings.ExperimentalTimezone) -- cgit v1.2.3-1-g7c22