Mercurial > hg > soundsoftware-site

changeset 526:930258005822 feature_36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:53:53 +0100
parents 1248a47e81b3 (current diff) 8a26a0e291cf (diff)
children af95d9a7507a
files
diffstat 1 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/app/models/ssamr_user_detail.rb	Mon Jul 25 14:39:38 2011 +0100
+++ b/app/models/ssamr_user_detail.rb	Mon Jul 25 14:53:53 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