diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index 5c758e0e..0a3408cf 100644 --- a/app/assets/javascripts/landing.js +++ b/app/assets/javascripts/landing.js @@ -65,7 +65,7 @@ }); $('.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) { diff --git a/app/controllers/bbb_controller.rb b/app/controllers/bbb_controller.rb index 7f8b3858..9e7b2ef6 100644 --- a/app/controllers/bbb_controller.rb +++ b/app/controllers/bbb_controller.rb @@ -69,6 +69,7 @@ class BbbController < ApplicationController base_url = "#{request.base_url}#{relative_root}/#{params[:resource]}/#{meeting_path}" options[:meeting_logout_url] = base_url options[:hook_url] = "#{base_url}/callback" + options[:moderator_message] = t('moderator_default_message', url: "#{base_url}") bbb_res = bbb_join_url( meeting_id, diff --git a/app/lib/bbb_api.rb b/app/lib/bbb_api.rb index 03765812..82a5fe22 100644 --- a/app/lib/bbb_api.rb +++ b/app/lib/bbb_api.rb @@ -48,13 +48,7 @@ module BbbApi options[:meeting_logout_url] ||= nil options[:meeting_name] ||= meeting_token options[:room_owner] ||= nil - - 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: "#{meeting_url}") + options[:moderator_message] ||= '' if !bbb return call_invalid_res