Mercurial > hg > soundsoftware-site

changeset 584:bed7ea82663d feature_36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some Author/User logic.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Wed, 10 Aug 2011 18:44:00 +0100
parents 4ee092298206
children 5818ebc11362
files vendor/plugins/redmine_bibliography/app/helpers/publications_helper.rb vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb
diffstat 2 files changed, 16 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/vendor/plugins/redmine_bibliography/app/helpers/publications_helper.rb	Wed Aug 10 17:58:16 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/helpers/publications_helper.rb	Wed Aug 10 18:44:00 2011 +0100
@@ -21,38 +21,33 @@
 
       # fc defined in the users_author_patch
       author_info = author.get_author_info
-
-      link_text = h(author.name)
-
-      user = author
-      
+  
     elsif author.class == Author    
 
       Rails.logger.debug { "Identify Author: AUTHOR" }
 
       author_info = { 
         :name_on_paper => author.name, 
-        :author_user_id => author.user_id,
-        :id => author.id, 
-        :is_user  => "0"
+        :author_user_id => '',
+        :is_user  => '0',
+        :institution => "",
+        :email => ""
       }
       
-      link_text = h(author.name)
-      
-      user = author.user
-    end
+      link_text = h(author.name)      
 
-    unless user.nil?
-      author_info[:email] = user.mail
-      unless user.ssamr_user_detail.nil?
-        author_info[:institution] = user.ssamr_user_detail.institution_name
-        suffix = '<em>' + h(author_info[:institution]) + '</em>'
+      if author.user.nil?
+        author_info[:author_user_id] = author.id
+        # TODO: AUTHORSHIPS INFORMATION
+#     else
+#       author_info[:email] = author.user.mail
+#       author_info[:institution] = author.user.institution_name
       end
     end
     
-    unless link_text.empty?
-      link_to_function(link_text, "update_author_info(this," + author_info.to_json + ")") + ' ' + suffix
-    end
+    suffix = '<em>' + h(author_info[:institution]) + '</em>'
+
+    link_to_function(link_text, "update_author_info(this," + author_info.to_json + ")") + ' ' + suffix
   end
   
   def choose_author_link(name, authors_users)
--- a/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb	Wed Aug 10 17:58:16 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb	Wed Aug 10 18:44:00 2011 +0100
@@ -22,7 +22,7 @@
           :is_user => "1"                    
         }
 
-        unless self.ssamr_user_detail.nil?
+        if not self.ssamr_user_detail.nil?
           info[:institution]  = self.ssamr_user_detail.institution_name
         end