Mercurial > hg > soundsoftware-site

changeset 525:8a26a0e291cf luisf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added method to retrieve a user's institution name to the ssamr_user_detail Model.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:53:18 +0100
parents 0b6c82dead28
children 930258005822 3954b253cdb3
files app/models/ssamr_user_detail.rb
diffstat 1 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/app/models/ssamr_user_detail.rb	Mon Jul 25 14:23:37 2011 +0100
+++ b/app/models/ssamr_user_detail.rb	Mon Jul 25 14:53: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