changed around locations of files that inherit from base models

dcunited001 · Aug 14, 2011 · f6d58e9 · f6d58e9
1 parent da888a2
commit f6d58e9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/app/models/friend.rb → app/models/friend/friend.rb b/app/models/friend.rb → app/models/friend/friend.rb
diff --git a/app/models/member.rb b/app/models/member.rb
@@ -10,14 +10,14 @@ class Member < ActiveRecord::Base
   has_one :address, :as => :addressable, :dependent => :destroy
   belongs_to :rink
 
-  has_many :friends
-  has_many :friend_requests_recd, :class_name => 'Friendship', :foreign_key => 'member_requested_id'
-  has_many :friend_requests_sent, :class_name => 'Friendship', :foreign_key => 'member_requesting_id'
+  has_many :friends     #view_friends
+  has_many :friend_requests_recd, :class_name => Friendship, :foreign_key => 'member_requested_id'
+  has_many :friend_requests_sent, :class_name => Friendship, :foreign_key => 'member_requesting_id'
 
   #has_one :team  #or has_many :teams with current_team method?
-  has_many :team_mates
-  has_many :team_requests_recd, :class_name => 'TeamRequest', :foreign_key => 'member_requested_id'
-  has_many :team_requests_sent, :class_name => 'TeamRequest', :foreign_key => 'member_requesting_id'
+  has_many :team_mates  #view_team_mates
+  has_many :team_requests_recd, :class_name => TeamRequest, :foreign_key => 'member_requested_id'
+  has_many :team_requests_sent, :class_name => TeamRequest, :foreign_key => 'member_requesting_id'
 
   validates_presence_of :first_name, :last_name, :birthday, :alias
   validates_uniqueness_of :alias

diff --git a/app/models/admin.rb → app/models/member/admin.rb b/app/models/admin.rb → app/models/member/admin.rb
diff --git a/app/models/team_captain.rb → app/models/team/team_captain.rb b/app/models/team_captain.rb → app/models/team/team_captain.rb
diff --git a/app/models/team_mate.rb → app/models/team/team_mate.rb b/app/models/team_mate.rb → app/models/team/team_mate.rb
diff --git a/app/models/team_member.rb → app/models/team/team_member.rb b/app/models/team_member.rb → app/models/team/team_member.rb
diff --git a/config/application.rb b/config/application.rb
@@ -15,7 +15,9 @@ class Application < Rails::Application
     # Custom directories with classes and modules you want to be autoloadable.
     puts config.root
 
-    config.autoload_paths += %W(#{config.root}/app/models/roles)
+    config.autoload_paths += %W(#{config.root}/app/models/friend)
+    config.autoload_paths += %W(#{config.root}/app/models/member)
+    config.autoload_paths += %W(#{config.root}/app/models/team)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -141,7 +141,7 @@
 james = Factory(:member, :alias => 'anaconda')
 brandon = Factory(:member, :alias => 'bb_sk8r')
 
-puts 'Creating Some Teams'
+puts 'Creating Some Teams and Team Members'
 jammers_va = Factory(:team, :name => 'Jammers VA', :creator => dcunited)
 Factory(:team_member, :team => jammers_va, :member_requesting => dcunited, :member_requested => xm_jester_mx)
 Factory(:team_member_from, :team => jammers_va, :member_requesting => cooper, :member_requested => dcunited)
@@ -163,7 +163,3 @@
 
 
 
-
-
-
-