Skip to content

O
OHR Support
Commit 81b84f64 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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

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
parent dea072f5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
app/controllers/repositories_controller.rb
View file @ 81b84f64
......@@ -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? }
......
app/models/changeset.rb
View file @ 81b84f64
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment