From ed70db18611331de99b2a86b580947e56d0cb7e5 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 22 Jul 2015 15:12:50 -0700
Subject: When user is removed, a modal appears, which on closing redirects the
 user to town square.

---
 web/react/components/sidebar.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'web/react/components/sidebar.jsx')

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index ed75e51cf..a29c6a903 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -201,8 +201,13 @@ module.exports = React.createClass({
             if(msg.user_id === UserStore.getCurrentId()) {
                 AsyncClient.getChannels(true);
 
-                if(msg.props.channel_id === ChannelStore.getCurrentId()) {
-                    window.location.reload();
+                if(msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) {
+                    var channelName = ChannelStore.getCurrent().display_name;
+                    var curUser = UserStore.getProfile(msg.props.remover).username;
+                    $('#removed_from_channel').find('.modal-title').text("Removed from " + channelName);
+                    $('#removed_from_channel').find('.modal-body').children().text(curUser + " removed you from " + channelName);
+
+                    $('#removed_from_channel').modal('show');
                 }
             }
         }
-- 
cgit v1.2.3-1-g7c22

