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 +5 -2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bdc4ec4644 - Show all commits

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

@ -18,9 +18,10 @@ class Default::UnitsController < ApplicationController
end
def import
params = @unit.slice(Unit::ATTRIBUTES - [:symbol, :base_id])
current_user.units
.find_or_initialize_by(symbol: @unit.symbol)
.update!(base: @base, **@unit.slice(:name, :multiplier))
.update!(base: @base, **params)
run_and_render :index
end

2
app/controllers/units_controller.rb
View File

@ -58,7 +58,7 @@ class UnitsController < ApplicationController
private
def unit_params
params.require(:unit).permit(:symbol, :name, :base_id, :multiplier)
params.require(:unit).permit(Unit::ATTRIBUTES)
end
def find_unit

2
app/models/unit.rb
View File

@ -1,4 +1,6 @@
class Unit < ApplicationRecord
ATTRIBUTES = [:symbol, :name, :multiplier, :base_id]
belongs_to :user, optional: true
belongs_to :base, optional: true, class_name: "Unit"
has_many :subunits, class_name: "Unit", dependent: :restrict_with_error, inverse_of: :base