Skip to content

Commit 96f7d77

Browse files
committed
Fixes to update user on the fly
Signed-off-by: Akash Manohar J <akash@akash.im>
1 parent 4d5cfa7 commit 96f7d77

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

app/assets/javascripts/backbone/broadcasters/faye.js.coffee

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class Kandan.Broadcasters.FayeBroadcaster
2626

2727

2828
processEventsForUser: (eventName, data)->
29+
console.log "event:", eventName
2930
$(document).data('active_users', data.extra.active_users)
3031
Kandan.Data.ActiveUsers.runCallbacks("change", data)
3132

app/models/user_observer.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
class UserObserver < ActiveRecord::Observer
22

33
def after_save(user)
4-
ActiveUsers.update_user(user) if user.first_name_changed? or user.last_name_changed?
4+
if defined?(ActiveUsers)
5+
::ActiveUsers.update_user(user) if user.first_name_changed? or user.last_name_changed?
6+
end
57
end
68

79
end

config/initializers/kandan.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
module Kandan
99
def self.devise_modules
1010
standard = [:database_authenticatable, :registerable, :confirmable,
11-
:recoverable, :rememberable, :trackable, :validatable]
11+
:recoverable, :rememberable, :trackable, :validatable, :token_authenticatable]
1212
bushido = [:bushido_authenticatable, :trackable, :token_authenticatable]
1313

1414
::Bushido::Platform.on_bushido? ? bushido : standard

lib/active_users.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def find_by_user_id(user_id)
4747
def update_user(user)
4848
if find_by_user_id(user.id)
4949
@@users[user.id][:user] = user
50-
50+
publish_message "update", user
5151
end
5252
end
5353

@@ -61,7 +61,7 @@ def all
6161

6262
def publish_message(event, user)
6363
Channel.send("user_#{event}", user) if not event == "update"
64-
64+
6565
FAYE_CLIENT.publish("/app/activities", {
6666
:event => "user##{event}",
6767
:entity => user,

0 commit comments

Comments
 (0)