lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Included missing assets and fixed room delete 404 (#939)

This commit is contained in:
Ahmad Farhat 2020-01-28 15:31:42 -05:00 committed by farhatahmad
parent 3f8ffa61d7
commit e15e119d5d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/rooms_controller.rb
View File

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

6
config/initializers/assets.rb
View File

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