Improving error handling when uploading images.

EarthSystemCoG · Feb 10, 2015 · 9a85b85 · 9a85b85
1 parent c00fe83
commit 9a85b85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/cog/static/cog/img/error.jpeg b/cog/static/cog/img/error.jpeg
diff --git a/cog/templates/cog/doc/doc_upload.html b/cog/templates/cog/doc/doc_upload.html
@@ -4,7 +4,11 @@
 
 	<script type="text/javascript" src="{{ MEDIA_URL }}ckeditor/ckeditor.js"></script>
 	<script type="text/javascript">
-	window.parent.CKEDITOR.tools.callFunction( '{{ request.REQUEST.CKEditorFuncNum }}' , '{{ url }}' );
+		{% if error %}
+			// show the error message
+			alert("{{error}}");
+		{% endif %}
+		window.parent.CKEDITOR.tools.callFunction( '{{ request.REQUEST.CKEditorFuncNum }}' , '{{ url }}' );
 	</script>
 
 {% endblock %}

diff --git a/cog/views/views_doc.py b/cog/views/views_doc.py
@@ -41,6 +41,7 @@ def doc_upload(request, project_short_name):
             # retrieve the file URL (after it has been saved!), 
             # pass it on to the view for use by CKeditor
             url = instance.file.url
+            error = ''
 
             # create thumbnail
             # NOTE: already executed automatic when browsing through django-browser
@@ -53,10 +54,11 @@ def doc_upload(request, project_short_name):
 
         else:
             print 'Form errors:%s' % form.errors
-            form = UploadImageForm()
+            error = 'The file uploaded is not a valid image'
+            url = "%s%s" % (settings.STATIC_URL, 'cog/img/error.jpeg')
 
         return render_to_response('cog/doc/doc_upload.html', 
-                                  { 'title': 'File Upload', 'url':url }, 
+                                  { 'title': 'File Upload', 'url':url, 'error':error }, 
                                   context_instance=RequestContext(request) )    
 
 @login_required   

diff --git a/site_media/img/admin/error.jpeg b/site_media/img/admin/error.jpeg