From eecbc602f91b24116c5a00f64b6ac35e8124e7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 17 Nov 2015 14:41:45 +0100
Subject: [PATCH] misc: bring welco/wcs errors to the UI as alerts

---
 welco/static/js/welco.js |  4 ++--
 welco/views.py           | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/welco/static/js/welco.js b/welco/static/js/welco.js
index c3505f7..1a54055 100644
--- a/welco/static/js/welco.js
+++ b/welco/static/js/welco.js
@@ -121,7 +121,7 @@ $(function() {
               if (data.result == 'ok') {
                 window.location.reload();
               } else {
-                /* TODO: display error notification */
+                alert(data.msg);
               }
             },
             error: function(error) { console.log(':(', error); }
@@ -464,7 +464,7 @@ $(function() {
                 window.open(data.url, '_blank');
                 refresh_bottom_cells();
               } else {
-                /* TODO: display error notification */
+                alert(data.msg);
               }
             },
             error: function(error) { console.log(':(', error); }
diff --git a/welco/views.py b/welco/views.py
index 0e20b55..238d380 100644
--- a/welco/views.py
+++ b/welco/views.py
@@ -139,7 +139,12 @@ def qualification_done(request):
         for association in Association.objects.filter(
                 source_type=request.POST['source_type'],
                 source_pk=request.POST['source_pk']):
-            association.push(request)
+            try:
+                association.push(request)
+            except Exception, e:
+                response = HttpResponse(content_type='application/json')
+                json.dump({'err': '1', 'msg': str(e)}, response, indent=2)
+                return response
     source_object.save()
     response = HttpResponse(content_type='application/json')
     json.dump({'result': 'ok'}, response, indent=2)
@@ -173,10 +178,15 @@ def create_formdata(request, *args, **kwargs):
     response = HttpResponse(content_type='application/json')
     if request.method != 'POST':
         json.dump({'err': 1}, response)
-    else:
-        qualif = Association.objects.get(id=kwargs.get('pk'))
+        return response
+
+    qualif = Association.objects.get(id=kwargs.get('pk'))
+    try:
         qualif.push(request)
-        json.dump({'result': 'ok', 'url': qualif.formdata_url}, response)
+    except Exception, e:
+        json.dump({'err': 1, 'msg': str(e)}, response)
+        return response
+    json.dump({'result': 'ok', 'url': qualif.formdata_url}, response)
     return response
 
 @login_required