Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
pull from: fixin.me/fixin.me:master
merge into: Karavel:master
Conversation 0 Commits 53 Files Changed 50 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d439928e2 - Show all commits

2
app/controllers/default/units_controller.rb
View File

@ -40,6 +40,6 @@ class Default::UnitsController < ApplicationController
def find_unit(user) def find_unit(user)
@unit = Unit.find_by!(id: params[:id], user: user) @unit = Unit.find_by!(id: params[:id], user: user)
@base = Unit.find_by!(symbol: @unit.base.symbol, user: user? ? nil : user) if @unit.base @base = Unit.find_by!(symbol: @unit.base.symbol, user: user ? nil : current_user) if @unit.base
end end
end end