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

small fixes

This commit is contained in:
Zachary Chai 2017-02-09 17:54:53 -05:00
parent c44b38c3da
commit 330ce144ad
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/landing.js
View File

@ -65,7 +65,7 @@
}); });
$('.center-panel-wrapper').on ('click', '.meeting-start', function (event) { $('.center-panel-wrapper').on ('click', '.meeting-start', function (event) {
Turbolinks.visit(Meeting.getInstance().getURL()); Turbolinks.visit($('.meeting-url').val());
}); });
$('.center-panel-wrapper').on ('keypress', '.meeting-user-name', function (event) { $('.center-panel-wrapper').on ('keypress', '.meeting-user-name', function (event) {

1
app/controllers/bbb_controller.rb
View File

@ -69,6 +69,7 @@ class BbbController < ApplicationController
base_url = "#{request.base_url}#{relative_root}/#{params[:resource]}/#{meeting_path}" base_url = "#{request.base_url}#{relative_root}/#{params[:resource]}/#{meeting_path}"
options[:meeting_logout_url] = base_url options[:meeting_logout_url] = base_url
options[:hook_url] = "#{base_url}/callback" options[:hook_url] = "#{base_url}/callback"
options[:moderator_message] = t('moderator_default_message', url: "<a href=\"#{base_url}\" target=\"_blank\"><u>#{base_url}</u></a>")
bbb_res = bbb_join_url( bbb_res = bbb_join_url(
meeting_id, meeting_id,

8
app/lib/bbb_api.rb
View File

@ -48,13 +48,7 @@ module BbbApi
options[:meeting_logout_url] ||= nil options[:meeting_logout_url] ||= nil
options[:meeting_name] ||= meeting_token options[:meeting_name] ||= meeting_token
options[:room_owner] ||= nil options[:room_owner] ||= nil
options[:moderator_message] ||= ''
if options[:room_owner]
meeting_url = "#{request.base_url}/rooms/#{options[:room_owner]}/#{options[:meeting_name]}"
else
meeting_url = "#{request.base_url}/meetings/#{meeting_token}"
end
options[:moderator_message] ||= t('moderator_default_message', url: "<a href=\"#{meeting_url}\" target=\"_blank\"><u>#{meeting_url}</u></a>")
if !bbb if !bbb
return call_invalid_res return call_invalid_res