From 8d842efb12ee7db88505e3078b626855e55aa4bf Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 17 Jan 2010 18:31:52 +0100 Subject: some fixes, closed #62 ?? --- module/web/ajax/urls.py | 1 + module/web/ajax/views.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'module/web/ajax') diff --git a/module/web/ajax/urls.py b/module/web/ajax/urls.py index 4decc27b1..7d63ef5a6 100644 --- a/module/web/ajax/urls.py +++ b/module/web/ajax/urls.py @@ -18,6 +18,7 @@ urlpatterns = patterns('ajax', (r'^queue$', 'views.queue'), (r'^pause$', 'views.pause'), (r'^unpause$', 'views.unpause'), + (r'^cancel$', 'views.cancel'), (r'^packages$', 'views.packages'), (r'^package/(\d+)$', 'views.package'), (r'^link/(\d+)$', 'views.link'), diff --git a/module/web/ajax/views.py b/module/web/ajax/views.py index ea092745f..4f136cef9 100644 --- a/module/web/ajax/views.py +++ b/module/web/ajax/views.py @@ -30,7 +30,7 @@ class JsonResponse(HttpResponse): object, indent=2, cls=json.DjangoJSONEncoder, ensure_ascii=False) super(JsonResponse, self).__init__( - content, content_type='application/json') #@TODO uncomment + content)#, content_type='application/json') #@TODO uncomment self['Cache-Control'] = 'no-cache, must-revalidate' @@ -117,6 +117,12 @@ def unpause(request): return HttpResponseServerError() +@permission('pyload.can_change_status') +def cancel(request): + try: + return JsonResponse(settings.PYLOAD.stop_downloads()) + except: + return HttpResponseServerError() @permission('pyload.can_see_dl') def packages(request): -- cgit v1.2.3