From 0f94e8ade8222e2e770136ed452564d1b74edbf9 Mon Sep 17 00:00:00 2001 From: Roland SAIKALI Date: Sun, 9 Sep 2012 18:51:40 +0200 Subject: [PATCH 1/2] Add an Ajax view for android development. --- skwissh/urls.py | 3 +++ skwissh/views.py | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/skwissh/urls.py b/skwissh/urls.py index 8432d9b..63ac86d 100644 --- a/skwissh/urls.py +++ b/skwissh/urls.py @@ -64,6 +64,9 @@ def get_groups(): # Ajax url(r'^mesures/(\d+)/(\d+)/(\w+)/$', 'skwissh.views.mesures', name='mesures'), + + # Ajax for Android + url(r'^servers/$', 'skwissh.views.servers', name='servers'), ) if settings.DEBUG: diff --git a/skwissh/views.py b/skwissh/views.py index a8ad6b2..fb29e04 100644 --- a/skwissh/views.py +++ b/skwissh/views.py @@ -78,3 +78,11 @@ def mesures(request, server_id, probe_id, period): return HttpResponse(serializers.serialize('json', data), 'application/javascript') else: return HttpResponseServerError() + + +def servers(request): + return HttpResponse(serializers.serialize('json', Server.objects.all().select_related()), 'application/javascript') + if request.is_ajax(): + return HttpResponse(serializers.serialize('json', Server.objects.all()), 'application/javascript') + else: + return HttpResponseServerError() From b60b61ee43beaa100b8134c95f8139a7d25605bd Mon Sep 17 00:00:00 2001 From: Roland SAIKALI Date: Sun, 9 Sep 2012 20:03:47 +0200 Subject: [PATCH 2/2] Login required for new ajax view. --- skwissh/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/skwissh/views.py b/skwissh/views.py index 10478fb..56c97b6 100644 --- a/skwissh/views.py +++ b/skwissh/views.py @@ -81,6 +81,7 @@ def mesures(request, server_id, probe_id, period): return HttpResponseServerError() +@login_required def servers(request): return HttpResponse(serializers.serialize('json', Server.objects.all().select_related()), 'application/javascript') if request.is_ajax():