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

fix email link

This commit is contained in:
Zachary Chai 2017-02-21 16:27:54 -05:00
parent 55f2041b7c
commit 80374e02a5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/channels/recording_update.js
View File

@ -47,9 +47,7 @@
} else if (data.action === 'create') { } else if (data.action === 'create') {
if (row.length == 0) { if (row.length == 0) {
data.duration = data.length; recordings.refresh();
table.rows.add([data]);
recordings.draw();
showAlert(I18n.recording_created, 4000); showAlert(I18n.recording_created, 4000);
} }

3
app/mailers/notification_mailer.rb
View File

@ -20,6 +20,9 @@ class NotificationMailer < ActionMailer::Base
def recording_ready_email(user) def recording_ready_email(user)
@user = user @user = user
@room_url = meeting_room_url(resource: 'rooms', id: user.encrypted_id) @room_url = meeting_room_url(resource: 'rooms', id: user.encrypted_id)
unless @room_url.include? "#{Rails.configuration.relative_url_root}/"
@room_url = @room_url.split('/rooms/').join("#{Rails.configuration.relative_url_root}/rooms/")
end
mail(to: user.email, subject: t('.subject')) mail(to: user.email, subject: t('.subject'))
end end
end end