Merge pull request #1142 from emanueldima/mail-config

Simplified mail sending; config default to not sending
EUDAT-B2SHARE · Sep 30, 2016 · 0109d34 · 0109d34
2 parents 0754009 + 0c86f9d
commit 0109d34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/b2share/config.py b/b2share/config.py
@@ -43,6 +43,7 @@
 
 
 SUPPORT_EMAIL = None # must be setup in the local instances
+MAIL_SUPPRESS_SEND = True # this should be removed on a real instance
 
 
 # Default language and timezone

diff --git a/b2share/modules/records/views.py b/b2share/modules/records/views.py
@@ -352,11 +352,7 @@ def post(self, **kwargs):
                       sender=str(request.json['email']),
                       recipients=[support],
                       body=msg_content)
-        app = Flask('abuseapp')
-        app.config.update(MAIL_SUPPRESS_SEND=True)
-        InvenioMail(app)
-        with app.app_context():
-            app.extensions['mail'].send(msg)
+        current_app.extensions['mail'].send(msg)
         return jsonify({'message':'The record is reported.'})
 
 
@@ -388,9 +384,5 @@ def post(self, **kwargs):
                       sender=str(request.json['email']),
                       recipients=[support],
                       body=msg_content)
-        app = Flask('accessapp')
-        app.config.update(MAIL_SUPPRESS_SEND=True)
-        InvenioMail(app)
-        with app.app_context():
-            app.extensions['mail'].send(msg)
+        current_app.extensions['mail'].send(msg)
         return jsonify({'message': 'An email was sent to the record owner.'})