# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1314190750 -3600
# Node ID 95a7d6187454099f431ef6eaa528d4624fc90d5f
# Parent  df7551a82bbe74a00fdb021ac514208bdec468b4# Parent  4ede44d53f76f765449e23ea18c4149531cf9089
Merge from 620:4ede44d53f76

diff -r 4ede44d53f76 -r 95a7d6187454 vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb
--- a/vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb	Wed Aug 24 13:38:31 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb	Wed Aug 24 13:59:10 2011 +0100
@@ -21,7 +21,7 @@
     
     # and at least one author
     # @publication.authorships.build.build_author        
-    @author_options = [User.current]
+    @author_options = [["#{User.current.name} (#{User.current.mail})", "#{User.current.class.to_s}_#{User.current.id.to_s}"]]
 
 
   end
@@ -29,7 +29,7 @@
   def create    
     @project = Project.find(params[:project_id])
 
-    @author_options = [User.current]
+    @author_options = [["#{User.current.name} (#{User.current.mail})", "#{User.current.class.to_s}_#{User.current.id.to_s}"]]
 
     @publication = Publication.new(params[:publication])
     @publication.projects << @project unless @project.nil?
@@ -79,7 +79,7 @@
     
     @edit_view = true;
     
-    @author_options = [] 
+    @options = [["#{User.current.name} (#{User.current.mail})", "#{User.current.class.to_s}_#{User.current.id.to_s}"]]
     @publication = Publication.find(params[:id])
     @selected_bibtex_entry_type_id = @publication.bibtex_entry.entry_type  
   end