diff --git a/app/views/shared/_flash_messages.html.erb b/app/views/shared/_flash_messages.html.erb
index 01f9682e..b24b32bf 100644
--- a/app/views/shared/_flash_messages.html.erb
+++ b/app/views/shared/_flash_messages.html.erb
@@ -13,6 +13,14 @@
# with BigBlueButton; if not, see
.
%>
-<% flash.each do |key, value| %>
- <%= content_tag :div, value, class: "flash #{key} d-inline-block text-success" %>
+<% flash.each do |key,value| %>
+ <% if key.eql? "success" %>
+ <%= render "shared/success_banner" do %>
+ <%= content_tag :div, value, class: "flash #{key} d-inline" %>
+ <% end %>
+ <% elsif key.eql? "alert" %>
+ <%= render "shared/error_banner" do %>
+ <%= content_tag :div, value, class: "flash #{key} d-inline" %>
+ <% end %>
+ <% end %>
<% end %>
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index 236ef390..12526319 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -22,7 +22,7 @@
<% if current_user %>
-
+
<%= t("header.create_room") %>
diff --git a/app/views/shared/_success_banner.html.erb b/app/views/shared/_success_banner.html.erb
new file mode 100644
index 00000000..d1e57a90
--- /dev/null
+++ b/app/views/shared/_success_banner.html.erb
@@ -0,0 +1,18 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see
.
+%>
+
+
+ <%= yield %>
+
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb
index 1ff66ade..d10925cb 100644
--- a/app/views/shared/components/_room_block.html.erb
+++ b/app/views/shared/components/_room_block.html.erb
@@ -13,7 +13,7 @@
# with BigBlueButton; if not, see
.
%>
-
class="card">
+
class="card">
@@ -47,14 +47,12 @@
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b99b68d3..bbc8a0d8 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -121,7 +121,15 @@ en:
with: Sign in with %{provider}
forgot_password: Forgot Password?
rename_recording:
-
+ room_settings:
+ title: Room Settings
+ update: Update Room
+ client: Select client type
+ mute: Mute users when they join
+ default: Default
+ html: HTML5
+ flash: Flash
+ footer_text: Adjustment to your room can be done at anytime.
rename_room:
name_placeholder: Enter a new room name...
name_update_success: Room name successfully changed!
@@ -157,6 +165,8 @@ en:
confirm: New Password Confirmation
update: Update Password
room:
+ create_room_error: There was an error creating the room
+ create_room_success: Room created successfully
invited: You have been invited to join
invite_participants: Invite Participants
join: Join
@@ -167,6 +177,8 @@ en:
sessions: Sessions
settings: Room Settings
start: Start
+ update_settings_error: There was an error updating the room settings
+ update_settings_success: Room settings successfully updated
wait:
message: Oops! The meeting hasn't started yet.
auto: You will automatically join when the meeting starts.
diff --git a/config/routes.rb b/config/routes.rb
index b6846ed3..f5c7b5d4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -68,6 +68,7 @@ Rails.application.routes.draw do
scope '/:room_uid' do
post '/', to: 'rooms#join'
patch '/', to: 'rooms#update', as: :update_room
+ post '/update_settings', to: 'rooms#update_settings'
post '/start', to: 'rooms#start', as: :start_room
get '/logout', to: 'rooms#logout', as: :logout_room
diff --git a/db/migrate/20190122210632_add_room_settings_to_room.rb b/db/migrate/20190122210632_add_room_settings_to_room.rb
new file mode 100644
index 00000000..5d4cc8f1
--- /dev/null
+++ b/db/migrate/20190122210632_add_room_settings_to_room.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRoomSettingsToRoom < ActiveRecord::Migration[5.0]
+ def change
+ add_column :rooms, :room_settings, :string, default: "{ }"
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2626d041..a2340fdb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,17 +10,18 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20181217142710) do
+ActiveRecord::Schema.define(version: 20190122210632) do
create_table "rooms", force: :cascade do |t|
t.integer "user_id"
t.string "name"
t.string "uid"
t.string "bbb_id"
- t.integer "sessions", default: 0
+ t.integer "sessions", default: 0
t.datetime "last_session"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "room_settings", default: "{ }"
t.index ["bbb_id"], name: "index_rooms_on_bbb_id"
t.index ["last_session"], name: "index_rooms_on_last_session"
t.index ["name"], name: "index_rooms_on_name"
diff --git a/spec/controllers/rooms_controller_spec.rb b/spec/controllers/rooms_controller_spec.rb
index 89b86468..5270e1fb 100644
--- a/spec/controllers/rooms_controller_spec.rb
+++ b/spec/controllers/rooms_controller_spec.rb
@@ -79,14 +79,19 @@ describe RoomsController, type: :controller do
@owner = create(:user)
end
- it "should create room with name" do
+ it "should create room with name and correct settings" do
@request.session[:user_id] = @owner.id
name = Faker::Pokemon.name
- post :create, params: { room: { name: name } }
+
+ room_params = { name: name, "client": "html5", "mute_on_join": "1" }
+ json_room_settings = "{\"muteOnStart\":true,\"joinViaHtml5\":true}"
+
+ post :create, params: { room: room_params }
r = @owner.secondary_rooms.last
expect(r.name).to eql(name)
expect(r.owner).to eql(@owner)
+ expect(r.room_settings).to eql(json_room_settings)
expect(response).to redirect_to(r)
end
@@ -212,6 +217,36 @@ describe RoomsController, type: :controller do
end
end
+ describe "POST #update_settings" do
+ before do
+ @user = create(:user)
+ @secondary_room = create(:room, owner: @user)
+ end
+
+ it "properly updates room name through the room settings modal and redirects to current page" do
+ @request.session[:user_id] = @user.id
+ name = Faker::Pokemon.name
+
+ room_params = { room_uid: @secondary_room.uid, room: { "name": name } }
+
+ expect { post :update_settings, params: room_params }.to change { @secondary_room.reload.name }
+ .from(@secondary_room.name).to(name)
+ expect(response).to redirect_to(@secondary_room)
+ end
+
+ it "properly updates room settings through the room settings modal and redirects to current page" do
+ @request.session[:user_id] = @user.id
+
+ room_params = { "client": "html5", "mute_on_join": "1", "name": @secondary_room.name }
+ formatted_room_params = "{\"muteOnStart\":true,\"joinViaHtml5\":true}" # JSON string format
+
+ expect { post :update_settings, params: { room_uid: @secondary_room.uid, room: room_params } }
+ .to change { @secondary_room.reload.room_settings }
+ .from(@secondary_room.room_settings).to(formatted_room_params)
+ expect(response).to redirect_to(@secondary_room)
+ end
+ end
+
describe "PATCH #update" do
before do
@user = create(:user)