diff options
| author | enahum <nahumhbl@gmail.com> | 2017-02-23 11:08:48 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 11:08:48 -0300 |
| commit | 748a416961923932e9b2969beb2730ee8c240ea7 (patch) | |
| tree | f6ab74d35fc1be8b9015f8a89e7ac6058ec1d4fe /app/import.go | |
| parent | ca7d3b6e7bc2e52cf40180a462492313f298e760 (diff) | |
| download | chat-748a416961923932e9b2969beb2730ee8c240ea7.tar.gz chat-748a416961923932e9b2969beb2730ee8c240ea7.tar.bz2 chat-748a416961923932e9b2969beb2730ee8c240ea7.zip | |
PLT-3193 Add channel notification preferences for push and email noti… (#5500)
* 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
Diffstat (limited to 'app/import.go')
| -rw-r--r-- | app/import.go | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |