# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1311602431 -3600
# Node ID 7c7199e1f1744d4b8ee41fc816566d650a78bd49
# Parent  ceca8eb1ac6ec1cce1a9f5620964a6bd4a77ff81# Parent  af95d9a7507a05006621b57522b7c9701caec69a
Merge from branch "feature_36"

diff -r ceca8eb1ac6e -r 7c7199e1f174 app/models/ssamr_user_detail.rb
--- a/app/models/ssamr_user_detail.rb	Mon Jul 25 13:17:08 2011 +0100
+++ b/app/models/ssamr_user_detail.rb	Mon Jul 25 15:00:31 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
diff -r ceca8eb1ac6e -r 7c7199e1f174 vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb
--- a/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb	Mon Jul 25 13:17:08 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb	Mon Jul 25 15:00:31 2011 +0100
@@ -39,10 +39,8 @@
           
           info[:name_on_paper] = "No Name"
           info[:email] = self.mail
-          if self.ssamr_user_detail
-            info[:institution]  = self.ssamr_user_detail.institution
-          else
-            info[:institution] = "No institution"
+          if not self.ssamr_user_detail.nil?
+            info[:institution]  = self.ssamr_user_detail.institution_name
           end
         end