From 2359d1256f687eb87dca16bd959eaf599255424c Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Mon, 12 Apr 2021 19:31:02 -0400 Subject: [PATCH] Fix bug that caused room edit to clear settings (#2649) --- app/controllers/rooms_controller.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 2de6aac6..fd4233c1 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -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