Fixed: Files assigned to a version can not be deleted if Issue Tracking module is...

Patch by Michael Esemplare.

git-svn-id: http://svn.redmine.org/redmine/trunk@13390 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/version.rb b/app/models/version.rb
index 76853e4b03ff524a357aee35c079764819f429a6..1d06360ef67a53bb20114bfaa65dd0bc0049f1ad 100644 (file)
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -60,6 +60,10 @@ class Version < ActiveRecord::Base
     project.present? && project.attachments_visible?(*args)
   end
 
+  def attachments_deletable?(usr=User.current)
+    project.present? && project.attachments_deletable?(usr)
+  end
+
   def start_date
     @start_date ||= fixed_issues.minimum('start_date')
   end

diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 068d8432158249dce464107a143e5daf4b9ff519..018f848d9cbf4672a848e70ee05b48ccf5327529 100644 (file)
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -387,6 +387,16 @@ class AttachmentsControllerTest < ActionController::TestCase
     end
   end
 
+  def test_destroy_version_attachment_with_issue_tracking_disabled
+    Project.find(1).disable_module! :issue_tracking
+    set_tmp_attachments_directory
+    @request.session[:user_id] = 2
+    assert_difference 'Attachment.count', -1 do
+      delete :destroy, :id => 9
+      assert_response 302
+    end
+  end
+
   def test_destroy_without_permission
     set_tmp_attachments_directory
     assert_no_difference 'Attachment.count' do