summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-09-13 10:17:15 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-09-13 10:17:15 +0000
commite124da5488291dc10fab0d17ebbf54b7f70b436b (patch)
treef1575d7a2bed12d30bb5711fcddd7c06c533d7be
parent34beae1c7a786c18c1b3e2d1ba3b10fa14d903b1 (diff)
downloadredmine-e124da5488291dc10fab0d17ebbf54b7f70b436b.tar.gz
redmine-e124da5488291dc10fab0d17ebbf54b7f70b436b.zip
Fixed: Files assigned to a version can not be deleted if Issue Tracking module is disabled (#17163).
Patch by Michael Esemplare. git-svn-id: http://svn.redmine.org/redmine/trunk@13390 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/version.rb4
-rw-r--r--test/functional/attachments_controller_test.rb10
2 files changed, 14 insertions, 0 deletions
diff --git a/app/models/version.rb b/app/models/version.rb
index 76853e4b0..1d06360ef 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 068d84321..018f848d9 100644
--- 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