When user is removed, a modal appears, which on closing redirects the

user to town square.
This commit is contained in:
nickago
2015-07-22 15:12:50 -07:00
parent c9459feb59
commit ed70db1861
5 changed files with 60 additions and 2 deletions

View File

@@ -712,6 +712,7 @@ func removeChannelMember(c *Context, w http.ResponseWriter, r *http.Request) {
message := model.NewMessage(c.Session.TeamId, "", userId, model.ACTION_USER_REMOVED)
message.Add("channel_id",id)
message.Add("remover", c.Session.UserId)
PublishAndForget(message)
c.LogAudit("name=" + channel.Name + " user_id=" + userId)

View File

@@ -0,0 +1,45 @@
// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
// See License.txt for license information.
var ChannelStore = require('../stores/channel_store.jsx');
var UserStore = require('../stores/user_store.jsx');
var utils = require('../utils/utils.jsx');
module.exports = React.createClass({
handleClose: function() {
var townSquare = ChannelStore.getByName("town-square");
utils.switchChannel(townSquare);
},
componentDidMount: function() {
$(this.getDOMNode()).on('hidden.bs.modal',this.handleClose);
},
componentWillUnmount: function() {
$(this.getDOMNode()).off('hidden.bs.modal',this.handleClose);
},
render: function() {
currentUser = UserStore.getCurrentUser();
if (currentUser != null) {
return (
<div className="modal fade" ref="modal" id="removed_from_channel" tabIndex="-1" role="dialog" aria-hidden="true">
<div className="modal-dialog">
<div className="modal-content">
<div className="modal-header">
<button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 className="modal-title" />
</div>
<div className="modal-body">
<p />
</div>
<div className="modal-footer">
<button type="button" className="btn btn-primary" data-dismiss="modal">Okay</button>
</div>
</div>
</div>
</div>
);
} else {
return <div/>;
}
}
});

View File

@@ -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');
}
}
}

View File

@@ -34,6 +34,7 @@ var MentionList = require('../components/mention_list.jsx');
var ChannelInfoModal = require('../components/channel_info_modal.jsx');
var AccessHistoryModal = require('../components/access_history_modal.jsx');
var ActivityLogModal = require('../components/activity_log_modal.jsx');
var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx')
var Constants = require('../utils/constants.jsx');
@@ -217,4 +218,9 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
document.getElementById('activity_log_modal')
);
React.render(
<RemovedFromChannelModal />,
document.getElementById('removed_from_channel_modal')
);
};

View File

@@ -47,6 +47,7 @@
<div id="channel_info_modal"></div>
<div id="access_history_modal"></div>
<div id="activity_log_modal"></div>
<div id="removed_from_channel_modal"></div>
<script>
window.setup_channel_page('{{ .Props.TeamDisplayName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}');
</script>