forked from External/greenlight
		
	small fixes
This commit is contained in:
		@@ -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) {
 | 
			
		||||
 
 | 
			
		||||
@@ -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: "<a href=\"#{base_url}\" target=\"_blank\"><u>#{base_url}</u></a>")
 | 
			
		||||
 | 
			
		||||
      bbb_res = bbb_join_url(
 | 
			
		||||
        meeting_id,
 | 
			
		||||
 
 | 
			
		||||
@@ -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: "<a href=\"#{meeting_url}\" target=\"_blank\"><u>#{meeting_url}</u></a>")
 | 
			
		||||
    options[:moderator_message] ||= ''
 | 
			
		||||
 | 
			
		||||
    if !bbb
 | 
			
		||||
      return call_invalid_res
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user