Merged r18008 from trunk to 3.4-stable (#31087).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18010 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/version.rb b/app/models/version.rb
index a213359f6f8ff5b189529dbecaaecb82fc227223..ee1d3daf091bc63d9341f67050775fe29fd13f68 100644 (file)
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -268,7 +268,7 @@ class Version < ActiveRecord::Base
   end
 
   def deletable?
-    fixed_issues.empty? && !referenced_by_a_custom_field?
+    fixed_issues.empty? && !referenced_by_a_custom_field? && attachments.empty?
   end
 
   def default_project_version

diff --git a/test/unit/version_test.rb b/test/unit/version_test.rb
index 40014375ac55d0f91ec2d34e07fb1884e78ffd6c..0f24f8e6075fad0d7ca2ca5ca9db6a6a0b07e96d 100644 (file)
--- a/test/unit/version_test.rb
+++ b/test/unit/version_test.rb
@@ -277,6 +277,13 @@ class VersionTest < ActiveSupport::TestCase
     assert_equal false, version.deletable?
   end
 
+  def test_deletable_should_return_false_when_referenced_by_an_attachment
+    version = Version.generate!
+    Attachment.generate!(:container => version, :filename => 'test.txt')
+
+    assert_equal false, version.deletable?
+  end
+
   def test_like_scope
     version = Version.create!(:project => Project.find(1), :name => 'Version for like scope test')