# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1312896639 -3600
# Node ID 049a1bcf38f14bba358f5bae164acc8ae1fb5941
# Parent  a47abc953e456997f72c677b69698b5771b6376b# Parent  5404f7dfb4b352fb8b0eb319b66b7c8e034fc47f
Merge from branch feature_36

diff -r a47abc953e45 -r 049a1bcf38f1 vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb
--- a/vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb	Tue Aug 09 10:58:37 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb	Tue Aug 09 14:30:39 2011 +0100
@@ -223,7 +223,7 @@
     end
     
     authors_list.each do |author|      
-      @results << author unless users_list.include?(author.user_id)
+      @results << author unless users_list.include?(author.user)
     end
                  
     render :layout => false
diff -r a47abc953e45 -r 049a1bcf38f1 vendor/plugins/redmine_bibliography/app/models/publication.rb
--- a/vendor/plugins/redmine_bibliography/app/models/publication.rb	Tue Aug 09 10:58:37 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/models/publication.rb	Tue Aug 09 14:30:39 2011 +0100
@@ -16,7 +16,7 @@
   
   has_and_belongs_to_many :projects, :uniq => true
   
-  after_save :set_initial_author_order
+  before_save :set_initial_author_order
   
   def set_initial_author_order
     authorships = self.authorships
@@ -26,7 +26,6 @@
     authorships.each_with_index do |authorship, index|
       if authorship.auth_order.nil?
          authorship.auth_order = index
-         authorship.update
       end
     end    
   end
diff -r a47abc953e45 -r 049a1bcf38f1 vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb
--- a/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb	Tue Aug 09 10:58:37 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/lib/bibliography/user_author_patch.rb	Tue Aug 09 14:30:39 2011 +0100
@@ -6,10 +6,6 @@
       base.send(:include, InstanceMethods) 
       extend ClassMethods     
           
-      base.class_eval do
-        has_one :publication
-                                    
-      end
     end #self.included
     
     module ClassMethods
@@ -48,4 +44,4 @@
     end #InstanceMethods
     
   end #UserPublicationsPatch
-end #RedmineBibliography
\ No newline at end of file
+end #RedmineBibliography