Merge branch 'master' of https://github.com/rsaikali/django-skwissh

rsaikali · Sep 9, 2012 · 3f79866 · 3f79866
2 parents 6ea61ef + b60b61e
commit 3f79866
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git 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
@@ -79,3 +79,12 @@ def mesures(request, server_id, probe_id, period):
         return HttpResponse(serializers.serialize('json', data), 'application/javascript')
     else:
         return HttpResponseServerError()
+
+
+@login_required
+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()