jro_apps/redmine Commit - r13994:bc9ca5fcfd74

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

Jean-Philippe Lang -

r13994:bc9ca5fcfd74

parent child

Context file:

r13994:bc9ca5fcfd74

app/controllers/versions_controller.rb +1 -1

               end
               def destroy
-                if @version.fixed_issues.empty?
+                if @version.deletable?
                   @version.destroy
                   respond_to do |format|
                     format.html { redirect_back_or_default settings_project_path(@project, :tab => 'versions') }

app/models/version.rb +9 0

                 sharing != 'none'
               end
+              def deletable?
+                fixed_issues.empty? && !referenced_by_a_custom_field?
+              end
               private
               def load_issue_counts
                   progress
                 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

test/object_helpers.rb +1 0

                 @generated_version_name.succ!
                 version = Version.new(attributes)
                 version.name = @generated_version_name.dup if version.name.blank?
+                version.project ||= Project.find(1)
                 yield version if block_given?
                 version.save!
                 version

test/unit/version_test.rb +21 0

@@ -235,6 +235,27 class VersionTest < ActiveSupport::TestCase
235	assert_equal @version, project_2_issue.fixed_version	235	assert_equal @version, project_2_issue.fixed_version
236	end	236	end
237		237
		238	def test_deletable_should_return_true_when_not_referenced
		239	version = Version.generate!
		240
		241	assert_equal true, version.deletable?
		242	end
		243
		244	def test_deletable_should_return_false_when_referenced_by_an_issue
		245	version = Version.generate!
		246	Issue.generate!(:fixed_version => version)
		247
		248	assert_equal false, version.deletable?
		249	end
		250
		251	def test_deletable_should_return_false_when_referenced_by_a_custom_field
		252	version = Version.generate!
		253	field = IssueCustomField.generate!(:field_format => 'version')
		254	value = CustomValue.create!(:custom_field => field, :customized => Issue.first, :value => version.id)
		255
		256	assert_equal false, version.deletable?
		257	end
		258
238	private	259	private
239		260
240	def add_issue(version, attributes={})	261	def add_issue(version, attributes={})

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages