diff --git a/app/controllers/characters_controller.rb b/app/controllers/characters_controller.rb index 2c1bce27..15e05192 100644 --- a/app/controllers/characters_controller.rb +++ b/app/controllers/characters_controller.rb @@ -16,6 +16,7 @@ class CharactersController < ContentController :mannerisms, :birthday, :birthplace, :education, :background, :fave_color, :fave_food, :fave_possession, :fave_weapon, :fave_animal, :father, :mother, :spouse, :siblings, :archenemy, :notes, :private_notes + # TODO: remove :siblings if needed / nested attributes ] end end diff --git a/app/models/character.rb b/app/models/character.rb index d24046aa..a62aeed1 100644 --- a/app/models/character.rb +++ b/app/models/character.rb @@ -52,6 +52,7 @@ class Character < ActiveRecord::Base relations: { icon: 'face', attributes: %w(mother father spouse siblings archenemy) + # TODO: recognize siblings is association }, notes: { icon: 'edit', diff --git a/db/schema.rb b/db/schema.rb index 44a76517..afc8662f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -47,7 +47,6 @@ ActiveRecord::Schema.define(version: 20160405035806) do t.text "father" t.text "mother" t.text "spouse" - t.text "siblings" t.text "archenemy" t.text "notes" t.text "private_notes"