Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Felix Niklas 2016-02-17 18:12:43 +01:00
commit 9e40e36bd8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -393,7 +393,7 @@ class ApplicationController < ActionController::Base
data = { data = {
error: error error: error
} }
if error =~ /(already exists|duplicate key)/i if error =~ /(already exists|duplicate key|duplicate entry)/i
data[:error_human] = 'Object already exists!' data[:error_human] = 'Object already exists!'
end end
data data