Fixed: links to changesets in activity and atom feeds uses project id instead project...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2663 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 3e8ac3e3d41d123d8eed8e27307a7c6de4647956..201845fa573438c3e581db89ed256d8612a9f2f3 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -100,7 +100,7 @@ class RepositoriesController < ApplicationController
     @changesets = @repository.changesets.find(:all,
                                                :limit  =>  @changeset_pages.items_per_page,
                                                :offset =>  @changeset_pages.current.offset,
-            :include => :user)
+            :include => [:user, :repository])
 
     respond_to do |format|
       format.html { render :layout => false if request.xhr? }

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 41b4befc611bfbac7e57f0dadd5ff0a9435badef..eaa51b617b7b505737a1539551d662c1ec0be514 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -26,7 +26,7 @@ class Changeset < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
                 :description => :long_comments,
                 :datetime => :committed_on,
-                :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
+                :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}
                 
   acts_as_searchable :columns => 'comments',
                      :include => {:repository => :project},
@@ -35,7 +35,7 @@ class Changeset < ActiveRecord::Base
                      
   acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                             :author_key => :user_id,
-                            :find_options => {:include => {:repository => :project}}
+                            :find_options => {:include => [:user, {:repository => :project}]}
   
   validates_presence_of :repository_id, :revision, :committed_on, :commit_date
   validates_uniqueness_of :revision, :scope => :repository_id