Don't redirect to home after registration;

pull/2086/head
Marcelo Schmidt 9 years ago
parent 20ea2b19a2
commit 22def793c9
  1. 11
      packages/rocketchat-lib/client/lib/openRoom.coffee
  2. 2
      packages/rocketchat-ui-login/username/username.coffee
  3. 2
      packages/rocketchat-ui/lib/RoomManager.coffee

@ -23,9 +23,14 @@ currentTracker = undefined
room = ChatRoom.findOne(query)
if not room?
Session.set 'roomNotFound', {type: type, name: name}
BlazeLayout.render 'main', {center: 'roomNotFound'}
return
if type is 'd'
Meteor.call 'createDirectMessage', name, ->
openRoom('d', name)
else
Session.set 'roomNotFound', {type: type, name: name}
BlazeLayout.render 'main', {center: 'roomNotFound'}
return
$('.rocket-loader').remove();
mainNode = document.querySelector('.main-content')

@ -47,4 +47,4 @@ Template.username.events
if not err?
Meteor.call 'joinDefaultChannels'
FlowRouter.go 'index'

@ -155,7 +155,7 @@ RocketChat.Notifications.onUser 'message', (msg) ->
if openedRooms[typeName].ready
closeOlderRooms()
if subscription.ready()
if subscription.ready() && Meteor.userId()
if openedRooms[typeName].active isnt true
openedRooms[typeName].active = true

Loading…
Cancel
Save