summaryrefslogtreecommitdiffstats
path: root/app/helpers/repositories_helper.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-03 11:46:58 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-03 11:46:58 +0000
commit2cbf9c9cc48135019dae50ccc5d9b07a44af8325 (patch)
treea191f37eca9f1cd62ad15c8fa04af319d8068d6b /app/helpers/repositories_helper.rb
parentdd9c2cafa795ec00875981dcedd3287d2d005457 (diff)
downloadredmine-2cbf9c9cc48135019dae50ccc5d9b07a44af8325.tar.gz
redmine-2cbf9c9cc48135019dae50ccc5d9b07a44af8325.zip
Renamed #changes association to #filechanges (clash with AR::Base.changes that triggers errors with Rails 3.2.5).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9759 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/repositories_helper.rb')
-rw-r--r--app/helpers/repositories_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 0c0a39563..ccc606642 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -46,17 +46,17 @@ module RepositoriesHelper
end
def render_changeset_changes
- changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
+ changes = @changeset.filechanges.find(:all, :limit => 1000, :order => 'path').collect do |change|
case change.action
when 'A'
# Detects moved/copied files
if !change.from_path.blank?
change.action =
- @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
+ @changeset.filechanges.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
end
change
when 'D'
- @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
+ @changeset.filechanges.detect {|c| c.from_path == change.path} ? nil : change
else
change
end