atomaka/dokkan-data-rails
1
0
Fork 0
Code Releases Activity

Merge branch 'atomaka/bugfix/full-passive-skill' into 'development'

Browse source 
Show all relevant passive skill details

Fix to issue #2 

See merge request !8
This commit is contained in:
Andrew Tomaka 2015-10-23 13:42:49 -04:00
commit 70e44b948f
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/passive_skill.rb
View file

@ -6,4 +6,8 @@ class PassiveSkill < ActiveRecord::Base
uniqueness: { scope: :name } uniqueness: { scope: :name }
default_scope { order(:name) } default_scope { order(:name) }
def full
"#{name} - #{description}"
end
end end

5
app/views/admin/cards/_form.html.slim
View file

@ -17,8 +17,9 @@
.row .row
.col-md-6 .col-md-6
= f.association :leader_skill, label_method: :description = f.association :leader_skill, label_method: :description
.col-md-6 .row
= f.association :passive_skill .col-md-12
= f.association :passive_skill, label_method: :full
.row .row
.col-md-12 .col-md-12
= f.association :super_attack, label_method: :full = f.association :super_attack, label_method: :full