From e15e119d5db65956a87d251adf7eba1755f08928 Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Tue, 28 Jan 2020 15:31:42 -0500 Subject: [PATCH] Included missing assets and fixed room delete 404 (#939) --- app/controllers/rooms_controller.rb | 5 +++++ config/initializers/assets.rb | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 001bc8b1..d9fab3ad 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -128,6 +128,11 @@ class RoomsController < ApplicationController else flash[:success] = I18n.t("room.delete.success") end + + # Redirect to home room if the redirect_back location is the deleted room + return redirect_to @current_user.main_room if request.referer == room_url(@room) + + # Redirect to the location that the user deleted the room from redirect_back fallback_location: current_user.main_room end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 781516d9..12e51051 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -13,4 +13,8 @@ Rails.application.config.assets.version = '1.0' # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. -Rails.application.config.assets.precompile += %w(_primary_theme.scss pickr.min.js monolith.min.scss) +Rails.application.config.assets.precompile += %w(_primary_theme.scss + pickr.min.js + monolith.min.scss + bootstrap-select.min.js + bootstrap-select.min.css)