Commit 133837b4 authored by jplang's avatar jplang

Disallow users to delete a version referenced by a custom field (#20159).

git-svn-id: https://svn.redmine.org/redmine/trunk@14376 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 794ef5d9
...@@ -146,7 +146,7 @@ class VersionsController < ApplicationController ...@@ -146,7 +146,7 @@ class VersionsController < ApplicationController
end end
def destroy def destroy
if @version.fixed_issues.empty? if @version.deletable?
@version.destroy @version.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_back_or_default settings_project_path(@project, :tab => 'versions') } format.html { redirect_back_or_default settings_project_path(@project, :tab => 'versions') }
......
...@@ -227,6 +227,10 @@ class Version < ActiveRecord::Base ...@@ -227,6 +227,10 @@ class Version < ActiveRecord::Base
sharing != 'none' sharing != 'none'
end end
def deletable?
fixed_issues.empty? && !referenced_by_a_custom_field?
end
private private
def load_issue_counts def load_issue_counts
...@@ -288,4 +292,9 @@ class Version < ActiveRecord::Base ...@@ -288,4 +292,9 @@ class Version < ActiveRecord::Base
progress progress
end end
end end
def referenced_by_a_custom_field?
CustomValue.joins(:custom_field).
where(:value => id.to_s, :custom_fields => {:field_format => 'version'}).any?
end
end end
...@@ -125,6 +125,7 @@ module ObjectHelpers ...@@ -125,6 +125,7 @@ module ObjectHelpers
@generated_version_name.succ! @generated_version_name.succ!
version = Version.new(attributes) version = Version.new(attributes)
version.name = @generated_version_name.dup if version.name.blank? version.name = @generated_version_name.dup if version.name.blank?
version.project ||= Project.find(1)
yield version if block_given? yield version if block_given?
version.save! version.save!
version version
......
...@@ -235,6 +235,27 @@ class VersionTest < ActiveSupport::TestCase ...@@ -235,6 +235,27 @@ class VersionTest < ActiveSupport::TestCase
assert_equal @version, project_2_issue.fixed_version assert_equal @version, project_2_issue.fixed_version
end end
def test_deletable_should_return_true_when_not_referenced
version = Version.generate!
assert_equal true, version.deletable?
end
def test_deletable_should_return_false_when_referenced_by_an_issue
version = Version.generate!
Issue.generate!(:fixed_version => version)
assert_equal false, version.deletable?
end
def test_deletable_should_return_false_when_referenced_by_a_custom_field
version = Version.generate!
field = IssueCustomField.generate!(:field_format => 'version')
value = CustomValue.create!(:custom_field => field, :customized => Issue.first, :value => version.id)
assert_equal false, version.deletable?
end
private private
def add_issue(version, attributes={}) def add_issue(version, attributes={})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment