diff options
| -rw-r--r-- | chimere/templates/chimere/upload_file.html | 3 | ||||
| -rw-r--r-- | chimere/views.py | 4 | ||||
| -rw-r--r-- | docs/install.rst | 2 | ||||
| -rw-r--r-- | docs/upgrade.rst | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/chimere/templates/chimere/upload_file.html b/chimere/templates/chimere/upload_file.html index f82bad9..91a1444 100644 --- a/chimere/templates/chimere/upload_file.html +++ b/chimere/templates/chimere/upload_file.html @@ -37,8 +37,7 @@ jQuery(document).ready(function() { opener.focus(); self.close(); }).error(function (xhr, ajaxOptions, thrownError){ - alert(xhr.status); - alert(thrownError); + alert(xhr.responseText); } ); }); // --></script> diff --git a/chimere/views.py b/chimere/views.py index a77734d..a1f22c3 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -348,8 +348,8 @@ def processRouteFile(request, area_name='', file_id=None): return HttpResponse('('+simplejson.dumps({'wkt':route, 'file_id':file_id})+')', 'application/javascript', status=200) - except: - return HttpResponse(status=500) + except OSError as e: + return HttpResponse(e.strerror, status=500) else: return HttpResponse(status=400) diff --git a/docs/install.rst b/docs/install.rst index 2dd745b..9af5558 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -60,7 +60,7 @@ Linux distribution repositories. For instance on Debian Wheezy:: On Debian Squeeze (you need to activate backports):: - apt-get install -t squeeze-backports python-django + apt-get install -t squeeze-backports python-django libjs-jquery apt-get install python python-django-south python-beautifulsoup tinymce \ apache2 libgeos-3.2.0 proj-bin gdal-bin python-gdal python-lxml \ diff --git a/docs/upgrade.rst b/docs/upgrade.rst index f2d0d64..d7c7233 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -45,7 +45,7 @@ Then install the new dependencies:: apt-get install -t squeeze-backports python-django python-django-south \ python-simplejson libjs-jquery-ui python-pyexiv2 \ - python-feedparser javascript-common + python-feedparser javascript-common libjs-jquery Debian Wheezy +++++++++++++ |