lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #136 from zach-chai/update_notification 

update user waiting notification to show meeting name
This commit is contained in:
Zachary Chai 2017-02-28 17:54:19 -05:00 committed by GitHub
parent 7bb1340fef 03cae1ed19
commit 71505a18d2
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/channels/meeting_updates.js
View File

@ -52,7 +52,7 @@
// show a browser notification only to the owner // show a browser notification only to the owner
if (isRoomOwner()) { if (isRoomOwner()) {
showNotification(I18n.user_waiting_title, { showNotification(I18n.user_waiting_title, {
body: I18n.user_waiting_body.replace(/%{user}/, data.user) body: I18n.user_waiting_body.replace(/%{user}/, data.user).replace(/%{meeting}/, '"'+data.meeting_name+'"')
}); });
} }
} }

7
app/jobs/notify_user_waiting_job.rb
View File

@ -18,9 +18,8 @@ class NotifyUserWaitingJob < ApplicationJob
queue_as :default queue_as :default
def perform(room, meeting, user) def perform(room, meeting, user)
ActionCable.server.broadcast "#{room}-#{meeting}_meeting_updates_channel", payload = { action: 'user_waiting', user: user, meeting_name: meeting }
{ action: 'user_waiting', user: user } ActionCable.server.broadcast "#{room}-#{meeting}_meeting_updates_channel", payload
ActionCable.server.broadcast "#{room}_meeting_updates_channel", ActionCable.server.broadcast "#{room}_meeting_updates_channel", payload
{ action: 'user_waiting', user: user }
end end
end end

2
config/locales/en-us.yml
View File

@ -60,7 +60,7 @@ en-US:
unpublish_recording: Hide recording unpublish_recording: Hide recording
unlisted: Unlisted unlisted: Unlisted
unpublished: No one unpublished: No one
user_waiting_body: "%{user} is waiting to join your room!" user_waiting_body: "%{user} is waiting to join %{meeting}!"
user_waiting_title: A user is waiting user_waiting_title: A user is waiting
copied: Copied copied: Copied
copy_error: Use Ctrl-c to copy copy_error: Use Ctrl-c to copy