Merge branch 'master' into add-created-by-for-jobs

2026-01-31 23:26:23 -05:00 · 2016-04-26 16:16:51 +01:00
parent 94aab20317 bca61454f3
commit 18a2408faa
3 changed files with 8 additions and 3 deletions
--- a/app/errors.py
+++ b/app/errors.py
@@ -64,6 +64,8 @@ def register_errors(blueprint):
                'duplicate key value violates unique constraint "services_email_from_key"' in e.orig.pgerror):
            return jsonify(
                result='error',
-                message={'name': ["Duplicate service name '{}'".format(e.params.get('name', ''))]}
+                message={'name': ["Duplicate service name '{}'".format(
+                    e.params.get('name', e.params.get('email_from', ''))
+                )]}
            ), 400
        return jsonify(result='error', message="Internal server error"), 500