gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended

Browse source 
Conflicts:
	app/controllers/admin/registrations_controller.rb
	app/models/registration.rb
This commit is contained in:
Ancor Gonzalez Sosa 2013-07-16 15:59:00 +02:00
commit 243f33ff91
8 changed files with 217 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/registration.rb
View file

@ -4,6 +4,7 @@ class Registration < ActiveRecord::Base
belongs_to :dietary_choice
has_one :supporter_registration
has_one :supporter_level, :through => :supporter_registration
has_and_belongs_to_many :social_events
has_and_belongs_to_many :events