diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
| commit | 014498e1d74decd57d44d45c187fa4f4b968b811 (patch) | |
| tree | 948610d910d28fc976cdffffd533879a16b01557 /guides/source/association_basics.textile | |
| parent | 780ab582091cf06ded9540a5d4fef23086e9bac3 (diff) | |
| parent | 2fab826db055f7b59bb83b834d730d69c8c7b25e (diff) | |
| download | rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.gz rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.bz2 rails-014498e1d74decd57d44d45c187fa4f4b968b811.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/ruby_on_rails_guides_guidelines.textile
Diffstat (limited to 'guides/source/association_basics.textile')
| -rw-r--r-- | guides/source/association_basics.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/association_basics.textile b/guides/source/association_basics.textile index 493b7c30be..8ddc56bef1 100644 --- a/guides/source/association_basics.textile +++ b/guides/source/association_basics.textile @@ -342,9 +342,9 @@ In designing a data model, you will sometimes find a model that should have a re <ruby> class Employee < ActiveRecord::Base - has_many :subordinates, :class_name => "Employee" - belongs_to :manager, :class_name => "Employee", + has_many :subordinates, :class_name => "Employee", :foreign_key => "manager_id" + belongs_to :manager, :class_name => "Employee" end </ruby> |