Remove conflicting simplejson dependency; Remove raven which is incom…

…patible with Django 1.4; Add error when graph has no data

CHANGES.rst

@@ -5,7 +5,11 @@ Changelog of lizard-ui
 4.8 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Remove conflicting simplejson dependency.
+
+- Remove raven which is incompatible with Django 1.4.
+
+- Add error when graph has no data.
 
 
 4.7 (2012-08-23)

buildout.cfg

@@ -25,7 +25,6 @@ eggs =
 # Specific pins
 lizard-ui =
 django-compressor = 1.2a1
-simplejson = 2.4.0
 
 # Reported by buildout-versions
 django-appconf = 0.5

lizard_ui/static/lizard_ui/lizard.js

@@ -148,14 +148,16 @@ function reloadFlotGraph($graph, max_image_width, callback) {
                 var plot = flotGraphLoadData($graph, max_image_width, response);
                 $graph.attr('data-graph-loaded', 'true');
                 // fix for IE8...; IE7 is fine
-                fixIE8DrawBug(plot);
+                if (plot) {
+                    fixIE8DrawBug(plot);
+                }
                 if (callback !== undefined) {
                     callback();
                 }
             },
             timeout: 20000,
             error: function () {
-                $graph.html('Failed to load the graph data.');
+                $graph.html('Fout bij het laden van gegevens.');
             },
             complete: function () {
                 $loading.remove();
@@ -173,6 +175,10 @@ function reloadFlotGraph($graph, max_image_width, callback) {
  */
 function flotGraphLoadData($graph, max_image_width, response) {
     var data = response.data;
+    if (data.length === 0) {
+        $graph.html('Geen gegevens beschikbaar.');
+        return;
+    }
     var defaultOpts = {
         series: {
             points: { show: true, hoverable: true }

lizard_ui/tests.py

@@ -4,7 +4,6 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.utils import simplejson as json
 
 from lizard_ui.models import ApplicationIcon
 from lizard_ui.configchecker import checker

lizard_ui/testsettings.py

@@ -15,7 +15,6 @@
     'south',
     'compressor',
     'staticfiles',
-    'raven.contrib.django',
     'lizard_security',
     'django_extensions',
     'django_nose',
@@ -90,4 +89,4 @@
 ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'
 
 STATICFILES_FINDERS = STATICFILES_FINDERS
-LOGGING = setup_logging(BUILDOUT_DIR, sentry_level='WARN')
+LOGGING = setup_logging(BUILDOUT_DIR)

lizard_ui/views.py

@@ -3,6 +3,7 @@
 import logging
 import urlparse
 import urllib
+import json
 
 from django.conf import settings
 from django.contrib.auth import login
@@ -12,7 +13,6 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
-from django.utils import simplejson as json
 from django.utils.translation import ugettext as _
 from django.views.generic.base import TemplateView, View
 from django.views.generic.edit import FormView

setup.py

@@ -17,8 +17,6 @@
     'django-staticfiles >= 1.0',
     'django_compressor >= 1.1.2',  # Yes, underscore.
     'pytz',
-    'raven',
-    'simplejson',
     'docutils',  # For the admin docs.
     'lizard-security',
     'south',