diff --git a/app/assets/javascripts/rename.js b/app/assets/javascripts/rename.js index 49ddbce0..1631d9e1 100644 --- a/app/assets/javascripts/rename.js +++ b/app/assets/javascripts/rename.js @@ -123,7 +123,7 @@ $(document).on('turbolinks:load', function(){ if(element.is('#room-title')){ submit_update_request({ setting: "rename_header", - room_name: element.find('#user-text').text(), + name: element.find('#user-text').text(), }, element.data('path'), "POST"); } else if(element.is('#recording-title')){ diff --git a/app/controllers/concerns/authenticator.rb b/app/controllers/concerns/authenticator.rb index 3a8c1202..2fd6ded0 100644 --- a/app/controllers/concerns/authenticator.rb +++ b/app/controllers/concerns/authenticator.rb @@ -25,6 +25,8 @@ module Authenticator session[:user_id] = user.id + logger.info("Support: #{user.email} has successfully logged in.") + # If there are not terms, or the user has accepted them, check for email verification if !Rails.configuration.terms || user.accepted_terms check_email_verified(user) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 4283e46a..313f27a7 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -187,19 +187,18 @@ class RoomsController < ApplicationController # POST /:room_uid/update_settings def update_settings begin - raise "Room name can't be blank" if room_params[:name].empty? + options = params[:room].nil? ? params : params[:room] + raise "Room name can't be blank" if options[:name].blank? raise "Unauthorized Request" if !@room.owned_by?(current_user) || @room == current_user.main_room # Update the rooms settings - if room_params - room_settings_string = create_room_settings_string(room_params) - @room.update_attributes(room_settings: room_settings_string) - end + room_settings_string = create_room_settings_string(options) + @room.update_attributes(room_settings: room_settings_string) if @room.room_settings != room_settings_string # Update the rooms name if it has been changed - @room.update_attributes(name: params[:room_name] || room_params[:name]) if @room.name != room_params[:name] + @room.update_attributes(name: options[:name]) if @room.name != options[:name] # Update the room's access code if it has changed - @room.update_attributes(access_code: room_params[:access_code]) if @room.access_code != room_params[:access_code] + @room.update_attributes(access_code: options[:access_code]) if @room.access_code != options[:access_code] flash[:success] = I18n.t("room.update_settings_success") rescue => e