Fixed conflict with master

This commit is contained in:
jfederico
2017-08-15 20:44:06 +00:00
7 changed files with 19 additions and 8 deletions

View File

@ -47,8 +47,13 @@ class ApplicationController < ActionController::Base
end
helper_method :user_name_limit
def qrcode_generation_enabled
def bigbluebutton_endpoint_default?
Rails.configuration.bigbluebutton_endpoint_default == Rails.configuration.bigbluebutton_endpoint
end
helper_method :bigbluebutton_endpoint_default?
def qrcode_generation_enabled?
Rails.configuration.enable_qrcode_generation
end
helper_method :qrcode_generation_enabled
helper_method :qrcode_generation_enabled?
end

View File

@ -17,8 +17,6 @@
class LandingController < ApplicationController
include BbbApi
helper_method :admin?
def index
# If guest access is disabled, redirect the user to the guest landing and force login.
redirect_to guest_path if Rails.configuration.disable_guest_access
@ -77,6 +75,7 @@ class LandingController < ApplicationController
def admin?
@user && @user == current_user
end
helper_method :admin?
def preferences
@user = current_user

View File

@ -28,7 +28,7 @@ module BbbApi
end
def bbb
@bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8", true)
@bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8")
end
def bbb_meeting_id(id)

View File

@ -18,6 +18,9 @@
<div class="center-block center-panel-size col-xs-12">
<div class="panel panel-default">
<div class="panel-body">
<% if bigbluebutton_endpoint_default? %>
<div class="panel-alert alert alert-danger"><%= t('warning_bigbluebutton_endpoint_default') %></div>
<% end %>
<h3 class="title-wrapper text-center">
<%= yield :title %>
</h3>

View File

@ -44,7 +44,7 @@
<%= icon('envelope-o') %>
</button>
<% if qrcode_generation_enabled %>
<% if qrcode_generation_enabled? %>
<button type="button" class="btn btn-default meeting-url-qrcode has-tooltip"
title="<%= t('qrcode.explanation') %>"
data-qrcode-generated-hint="<%= t('qrcode.generated') %>"