diff app/models/user.rb @ 548:3954b253cdb3 luisf

Merge from branch "feature_36"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 29 Jul 2011 19:28:55 +0100
parents 1248a47e81b3
children 5e80956cc792
line wrap: on
line diff
--- a/app/models/user.rb	Mon Jul 25 14:53:18 2011 +0100
+++ b/app/models/user.rb	Fri Jul 29 19:28:55 2011 +0100
@@ -54,6 +54,8 @@
   
   has_one :ssamr_user_detail, :dependent => :destroy, :class_name => 'SsamrUserDetail'
   accepts_nested_attributes_for :ssamr_user_detail
+  
+  has_one :author
 
   # Active non-anonymous users scope
   named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"