Skip to content
Browse files

change controller name to allow REDMINE server acts as a proxy for

BigBlueButton
  • Loading branch information...
1 parent 0dfd788 commit aa90cc618af2b05186640b4e2e37bb1a9ce9bf3e @amartel committed Sep 1, 2011
View
2 app/controllers/bigbluebutton_controller.rb → app/controllers/bbb_controller.rb
@@ -5,7 +5,7 @@
require 'base64'
require 'rexml/document'
-class BigbluebuttonController < ApplicationController
+class BbbController < ApplicationController
before_filter :find_project, :authorize, :find_user
View
2 init.rb
@@ -16,7 +16,7 @@
settings :default => {'bbb_server' => '', 'bbb_salt' => ''}, :partial => 'settings-bbb/settings'
project_module :bigbluebutton do
- permission :bigbluebutton_join, :bigbluebutton => :start
+ permission :bigbluebutton_join, :bbb => :start
permission :bigbluebutton_start, {}
permission :bigbluebutton_moderator, {}
end
View
8 lib/project_sidebar_bbb_hook.rb
@@ -24,9 +24,9 @@ def view_projects_show_sidebar_bottom(context = { })
else
meeting_started = true
if Setting.plugin_redmine_bbb['bbb_popup'] != '1'
- output << link_to(l(:label_bigbluebutton_join), {:controller => 'bigbluebutton', :action => 'start', :project_id => context[:project], :only_path => true})
+ output << link_to(l(:label_bigbluebutton_join), {:controller => 'bbb', :action => 'start', :project_id => context[:project], :only_path => true})
else
- output << "<a href='' onclick='javascript:var wihe = \"width=\"+screen.availWidth+\",height=\"+screen.availHeight; open(\"" + url_for(:controller => 'bigbluebutton', :action => 'start', :project_id => context[:project], :only_path => true) + "\",\"Meeting\",\"directories=no,location=no,resizable=yes,scrollbars=yes,status=no,toolbar=no,\" + wihe);return false;'>#{l(:label_bigbluebutton_join)}</a>"
+ output << "<a href='' onclick='javascript:var wihe = \"width=\"+screen.availWidth+\",height=\"+screen.availHeight; open(\"" + url_for(:controller => 'bbb', :action => 'start', :project_id => context[:project], :only_path => true) + "\",\"Meeting\",\"directories=no,location=no,resizable=yes,scrollbars=yes,status=no,toolbar=no,\" + wihe);return false;'>#{l(:label_bigbluebutton_join)}</a>"
end
output << "<br><br>"
output << "#{l(:label_bigbluebutton_status)}: <b>#{l(:label_bigbluebutton_status_running)}</b>"
@@ -41,9 +41,9 @@ def view_projects_show_sidebar_bottom(context = { })
if !meeting_started
if User.current.allowed_to?(:bigbluebutton_start, @project)
if Setting.plugin_redmine_bbb['bbb_popup'] != '1'
- output << link_to(l(:label_bigbluebutton_start), {:controller => 'bigbluebutton', :action => 'start', :project_id => context[:project], :only_path => true})
+ output << link_to(l(:label_bigbluebutton_start), {:controller => 'bbb', :action => 'start', :project_id => context[:project], :only_path => true})
else
- output << "<a href='' onclick='javascript:var wihe = \"width=\"+screen.availWidth+\",height=\"+screen.availHeight; open(\"" + url_for(:controller => 'bigbluebutton', :action => 'start', :project_id => context[:project], :only_path => true) + "\",\"Meeting\",\"directories=no,location=no,resizable=yes,scrollbars=yes,status=no,toolbar=no,\" + wihe);return false;'>#{l(:label_bigbluebutton_start)}</a>"
+ output << "<a href='' onclick='javascript:var wihe = \"width=\"+screen.availWidth+\",height=\"+screen.availHeight; open(\"" + url_for(:controller => 'bbb', :action => 'start', :project_id => context[:project], :only_path => true) + "\",\"Meeting\",\"directories=no,location=no,resizable=yes,scrollbars=yes,status=no,toolbar=no,\" + wihe);return false;'>#{l(:label_bigbluebutton_start)}</a>"
end
output << "<br><br>"
end

0 comments on commit aa90cc6

Please sign in to comment.
Something went wrong with that request. Please try again.