master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
1 changed files with 10 additions and 5 deletions
Showing only changes of commit 2359d1256f - Show all commits

View File

@ -203,12 +203,17 @@ class RoomsController < ApplicationController
# Update the rooms values
room_settings_string = create_room_settings_string(options)
@room.update_attributes(
attributes = {
name: options[:name],
room_settings: room_settings_string,
access_code: options[:access_code],
moderator_access_code: options[:moderator_access_code]
)
}
unless params[:setting] == "rename_header"
attributes[:room_settings] = room_settings_string
attributes[:access_code] = options[:access_code]
attributes[:moderator_access_code] = options[:moderator_access_code]
end
@room.update(attributes)
flash[:success] = I18n.t("room.update_settings_success")
rescue => e