From 748a416961923932e9b2969beb2730ee8c240ea7 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Thu, 23 Feb 2017 11:08:48 -0300
Subject: =?UTF-8?q?PLT-3193=20Add=20channel=20notification=20preferences?=
 =?UTF-8?q?=20for=20push=20and=20email=20noti=E2=80=A6=20(#5500)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* PLT-3193 Add channel notification preferences for push and email notifications

* unit tests, model validation and localization

* Feedback review

* Adding back allowFromCache check

* Setting push and email to use default settings

* Move props as constants

* address feedback
---
 app/import.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/import.go')

diff --git a/app/import.go b/app/import.go
index 10a915b2a..c50c6d62d 100644
--- a/app/import.go
+++ b/app/import.go
@@ -581,11 +581,11 @@ func ImportUserChannels(user *model.User, team *model.Team, data *[]UserChannelI
 			notifyProps := member.NotifyProps
 
 			if cdata.NotifyProps.Desktop != nil {
-				notifyProps["desktop"] = *cdata.NotifyProps.Desktop
+				notifyProps[model.DESKTOP_NOTIFY_PROP] = *cdata.NotifyProps.Desktop
 			}
 
 			if cdata.NotifyProps.MarkUnread != nil {
-				notifyProps["mark_unread"] = *cdata.NotifyProps.MarkUnread
+				notifyProps[model.MARK_UNREAD_NOTIFY_PROP] = *cdata.NotifyProps.MarkUnread
 			}
 
 			if _, err := UpdateChannelMemberNotifyProps(notifyProps, channel.Id, user.Id); err != nil {
-- 
cgit v1.2.3-1-g7c22