summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-01-07 01:30:21 +0000
committerGo MAEDA <maeda@farend.jp>2018-01-07 01:30:21 +0000
commit2a54a539bbf878d00927148290f19b625089760f (patch)
treeb62b0f230634820aa92495d4753da9d94c48c385
parentac1f435af1419dac1479fc0bcdccdf7a6089eefd (diff)
downloadredmine-2a54a539bbf878d00927148290f19b625089760f.tar.gz
redmine-2a54a539bbf878d00927148290f19b625089760f.zip
Merged r17141 from trunk to 3.4-stable (#27695).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17142 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/issue_relations_controller.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb
index abdd60d7c..0bcc8c5e3 100644
--- a/app/controllers/issue_relations_controller.rb
+++ b/app/controllers/issue_relations_controller.rb
@@ -46,7 +46,13 @@ class IssueRelationsController < ApplicationController
@relation.issue_from = @issue
@relation.safe_attributes = params[:relation]
@relation.init_journals(User.current)
- saved = @relation.save
+
+ begin
+ saved = @relation.save
+ rescue ActiveRecord::RecordNotUnique
+ saved = false
+ @relation.errors.add :base, :taken
+ end
respond_to do |format|
format.html { redirect_to issue_path(@issue) }