summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-06-27 09:02:24 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-06-27 09:02:24 +0000
commitbc9ca5fcfd74ea699ea816aaf9e38edadd37b784 (patch)
tree34714c20aeeb5b6e252909f06b18e111a3ae209f /app
parent5b1fb525b81583c874991991ba00ed946719974f (diff)
downloadredmine-bc9ca5fcfd74ea699ea816aaf9e38edadd37b784.tar.gz
redmine-bc9ca5fcfd74ea699ea816aaf9e38edadd37b784.zip
Disallow users to delete a version referenced by a custom field (#20159).
git-svn-id: http://svn.redmine.org/redmine/trunk@14376 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/versions_controller.rb2
-rw-r--r--app/models/version.rb9
2 files changed, 10 insertions, 1 deletions
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 37de29df8..e6b1fec89 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -146,7 +146,7 @@ class VersionsController < ApplicationController
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') }
diff --git a/app/models/version.rb b/app/models/version.rb
index b8c7b6f60..9910700f2 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -227,6 +227,10 @@ class Version < ActiveRecord::Base
sharing != 'none'
end
+ def deletable?
+ fixed_issues.empty? && !referenced_by_a_custom_field?
+ end
+
private
def load_issue_counts
@@ -288,4 +292,9 @@ class Version < ActiveRecord::Base
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