From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 14 Sep 2014 09:20:19 +0000 (+0000)
Subject: Merged r13390 (#17163).
X-Git-Tag: 2.5.3~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=198e92d26b499d081a80350c00c080bd4922f12a;p=redmine.git

Merged r13390 (#17163).

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

diff --git a/app/models/version.rb b/app/models/version.rb
index 02061c548..2d1a8518a 100644
--- 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 580030762..63d1423b1 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -374,6 +374,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