summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-01-07 01:31:40 +0000
committerGo MAEDA <maeda@farend.jp>2018-01-07 01:31:40 +0000
commit1d1fbff99df59ddb3b8367740718173b9a37c5c0 (patch)
treed4cc4a89980c9c3cfd6e0ece6a1bb52101814187
parent8905b56b19df9a37ab4fb7e6e86286e5d4e1bdef (diff)
downloadredmine-1d1fbff99df59ddb3b8367740718173b9a37c5c0.tar.gz
redmine-1d1fbff99df59ddb3b8367740718173b9a37c5c0.zip
Merged r17141 from trunk to 3.3-stable (#27695).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17143 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 2e19cff68..1258928c8 100644
--- a/app/controllers/issue_relations_controller.rb
+++ b/app/controllers/issue_relations_controller.rb
@@ -44,7 +44,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) }