Mercurial > hg > soundsoftware-site

diff app/models/ssamr_user_detail.rb @ 689:a8e402f48723 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "live"
author Chris Cannam
date Fri, 16 Sep 2011 15:51:18 +0100
parents 8a26a0e291cf
children
line wrap: on
line diff
--- a/app/models/ssamr_user_detail.rb	Fri Sep 09 13:20:34 2011 +0100
+++ b/app/models/ssamr_user_detail.rb	Fri Sep 16 15:51:18 2011 +0100
@@ -10,5 +10,15 @@
       institution_id.blank? and other_institution.blank?
   end
 
-
+  def institution_name()
+    if not self.institution_type.nil?
+      if self.institution_type
+        Institution.find(self.institution_id).name
+      else
+        self.other_institution
+      end
+    else
+      ""
+    end
+  end
 end