merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-xx: Cleaning up bugs that appeared after refactoring (#780) 

* First step

* Fixed issues with update room
This commit is contained in:
Ahmad Farhat 2019-08-30 16:34:14 -04:00 committed by farhatahmad
parent d3b669d552
commit 666ee12988
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/rename.js
View File

@ -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')){

2
app/controllers/concerns/authenticator.rb
View File

@ -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)

13
app/controllers/rooms_controller.rb
View File

@ -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