From c9a0030551f289241407743fbd21080cd8a358a4 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Wed, 30 Sep 2015 12:28:28 -0400
Subject: Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps

---
 web/react/components/channel_notifications.jsx | 16 ++++++----------
 web/react/components/sidebar.jsx               |  2 +-
 web/react/utils/client.jsx                     | 16 ----------------
 3 files changed, 7 insertions(+), 27 deletions(-)

(limited to 'web')

diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index 55c0b5438..45981b295 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -41,7 +41,7 @@ export default class ChannelNotifications extends React.Component {
             var channelId = button.getAttribute('data-channelid');
 
             const member = ChannelStore.getMember(channelId);
-            var notifyLevel = member.notify_level;
+            var notifyLevel = member.notify_props.desktop;
             var markUnreadLevel = member.notify_props.mark_unread;
 
             this.setState({
@@ -62,7 +62,7 @@ export default class ChannelNotifications extends React.Component {
         }
 
         const member = ChannelStore.getMember(this.state.channelId);
-        var notifyLevel = member.notify_level;
+        var notifyLevel = member.notify_props.desktop;
         var markUnreadLevel = member.notify_props.mark_unread;
 
         var newState = this.state;
@@ -81,7 +81,7 @@ export default class ChannelNotifications extends React.Component {
         var channelId = this.state.channelId;
         var notifyLevel = this.state.notifyLevel;
 
-        if (ChannelStore.getMember(channelId).notify_level === notifyLevel) {
+        if (ChannelStore.getMember(channelId).notify_props.desktop === notifyLevel) {
             this.updateSection('');
             return;
         }
@@ -89,16 +89,12 @@ export default class ChannelNotifications extends React.Component {
         var data = {};
         data.channel_id = channelId;
         data.user_id = UserStore.getCurrentId();
-        data.notify_level = notifyLevel;
+        data.desktop = notifyLevel;
 
-        if (!data.notify_level || data.notify_level.length === 0) {
-            return;
-        }
-
-        Client.updateNotifyLevel(data,
+        Client.updateNotifyProps(data,
             () => {
                 var member = ChannelStore.getMember(channelId);
-                member.notify_level = notifyLevel;
+                member.notify_props.desktop = notifyLevel;
                 ChannelStore.setChannelMember(member);
                 this.updateSection('');
             },
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 821d7fd4a..6d4b56b7b 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -203,7 +203,7 @@ export default class Sidebar extends React.Component {
                 const user = UserStore.getCurrentUser();
                 const member = ChannelStore.getMember(msg.channel_id);
 
-                var notifyLevel = member.notify_level;
+                var notifyLevel = member.notify_props.desktop;
                 if (notifyLevel === 'default') {
                     notifyLevel = user.notify_props.desktop;
                 }
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index 041c00516..ea97b6421 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -568,22 +568,6 @@ export function updateChannelDesc(data, success, error) {
     track('api', 'api_channels_desc');
 }
 
-// TODO remove me
-export function updateNotifyLevel(data, success, error) {
-    $.ajax({
-        url: '/api/v1/channels/update_notify_level',
-        dataType: 'json',
-        contentType: 'application/json',
-        type: 'POST',
-        data: JSON.stringify(data),
-        success,
-        error: function onError(xhr, status, err) {
-            var e = handleError('updateNotifyLevel', xhr, status, err);
-            error(e);
-        }
-    });
-}
-
 export function updateNotifyProps(data, success, error) {
     $.ajax({
         url: '/api/v1/channels/update_notify_props',
-- 
cgit v1.2.3-1-g7c22