app/controllers/bigbluebutton/rooms_controller.rb in bigbluebutton_rails-2.3.0 vs app/controllers/bigbluebutton/rooms_controller.rb in bigbluebutton_rails-3.0.0
- old
+ new
@@ -122,11 +122,12 @@
@room.fetch_is_running?
rescue BigBlueButton::BigBlueButtonException => e
flash[:error] = e.to_s[0..200]
render :json => { :running => "false", :error => "#{e.to_s[0..200]}" }
else
- render :json => { :running => "#{@room.is_running?}" }
+ info = @room.fetch_meeting_info
+ render :json => { :running => "#{@room.is_running?}", :participants_qty => info}
end
end
def end
error = false
@@ -222,21 +223,21 @@
end
protected
def find_room
- @room ||= BigbluebuttonRoom.find_by(param: params[:id])
+ @room ||= BigbluebuttonRoom.find_by(slug: params[:id])
end
def set_request_headers
unless @room.nil?
@room.request_headers["x-forwarded-for"] = request.remote_ip
end
end
def join_check_room
- @room ||= BigbluebuttonRoom.find_by_param(params[:id]) unless params[:id].blank?
+ @room ||= BigbluebuttonRoom.find_by(slug: params[:id]) unless params[:id].blank?
if @room.nil?
message = t('bigbluebutton_rails.rooms.errors.join.wrong_params')
redirect_to :back, :notice => message
end
end
@@ -361,10 +362,10 @@
end
def room_allowed_params
[ :name, :meetingid, :attendee_key, :moderator_key, :welcome_msg,
:private, :logout_url, :dial_number, :voice_bridge, :max_participants, :owner_id,
- :owner_type, :external, :param, :record_meeting, :duration, :default_layout, :presenter_share_only,
+ :owner_type, :external, :slug, :record_meeting, :duration, :default_layout, :presenter_share_only,
:auto_start_video, :auto_start_audio, :background,
:moderator_only_message, :auto_start_recording, :allow_start_stop_recording,
:metadata_attributes => [ :id, :name, :content, :_destroy, :owner_id ] ]
end
end