diff --git a/lib/jam_ruby/models/user.rb b/lib/jam_ruby/models/user.rb index 6ca9df5c6..f5389e01b 100644 --- a/lib/jam_ruby/models/user.rb +++ b/lib/jam_ruby/models/user.rb @@ -2,7 +2,7 @@ module JamRuby class User < ActiveRecord::Base attr_accessible :name, :email, :password, :password_confirmation - attr_accessor :updating_password, :online, :photo_url + attr_accessor :updating_password self.primary_key = 'id' diff --git a/lib/jam_ruby/models/user_instrument.rb b/lib/jam_ruby/models/user_instrument.rb index 080b8def7..8da3a70fd 100644 --- a/lib/jam_ruby/models/user_instrument.rb +++ b/lib/jam_ruby/models/user_instrument.rb @@ -6,5 +6,9 @@ module JamRuby belongs_to :user belongs_to :instrument + def description + @description = self.instrument.description + end + end end \ No newline at end of file