diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-04-07 17:30:56 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-04-07 17:30:56 +0000 |
| commit | 81b84f641d9ed5c5fcca1893559812faecf14b3a (patch) | |
| tree | 6666d5558378000bfc70721db08fb9744685bc62 /app | |
| parent | dea072f50619dc3d610578fe2bc94d43b7a62bfd (diff) | |
| download | redmine-81b84f641d9ed5c5fcca1893559812faecf14b3a.tar.gz redmine-81b84f641d9ed5c5fcca1893559812faecf14b3a.zip | |
Fixed: links to changesets in activity and atom feeds uses project id instead project identifier (#3137).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2663 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/repositories_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/changeset.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 3e8ac3e3d..201845fa5 100644 --- 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 41b4befc6..eaa51b617 100644 --- 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 |