Mercurial > hg > soundsoftware-site
comparison app/models/user_preference.rb @ 931:ec1c49528f36 cannam_integration
Merge from branch "redmine-1.3"
| author | Chris Cannam |
|---|---|
| date | Wed, 27 Jun 2012 15:04:58 +0100 |
| parents | 5f33065ddc4b |
| children | 433d4f72a19b |
comparison
equal
deleted
inserted
replaced
| 930:027cc0f5d4a2 | 931:ec1c49528f36 |
|---|---|
| 17 | 17 |
| 18 class UserPreference < ActiveRecord::Base | 18 class UserPreference < ActiveRecord::Base |
| 19 belongs_to :user | 19 belongs_to :user |
| 20 serialize :others | 20 serialize :others |
| 21 | 21 |
| 22 attr_protected :others | 22 attr_protected :others, :user_id |
| 23 | 23 |
| 24 def initialize(attributes = nil) | 24 def initialize(attributes = nil) |
| 25 super | 25 super |
| 26 self.others ||= {} | 26 self.others ||= {} |
| 27 end | 27 end |