From 22549b842addd5c683d79c422afa52aa53a57e40 Mon Sep 17 00:00:00 2001 From: Michael Esemplare Date: Thu, 14 Aug 2014 18:53:56 -0700 Subject: Fixes Files assigned to a version can not be deleted if Issue Tracking module is disabled (#17163) --- app/models/version.rb | 4 ++++ test/functional/attachments_controller_test.rb | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/app/models/version.rb b/app/models/version.rb index 76853e4..1d06360 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 068d843..018f848 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 -- 1.7.9