Revision c00eba1c
b/flowspec/views.py | ||
---|---|---|
15 | 15 |
from django.core.context_processors import request |
16 | 16 |
from django.template.context import RequestContext |
17 | 17 |
from django.template.loader import get_template, render_to_string |
18 |
from django.utils import simplejson |
|
19 | 18 |
from django.core.urlresolvers import reverse |
20 | 19 |
from django.contrib import messages |
21 | 20 |
from flowspy.accounts.models import * |
... | ... | |
313 | 312 |
response_data = {} |
314 | 313 |
response_data['pk'] = "%s" %then.pk |
315 | 314 |
response_data['value'] = "%s:%s" %(then.action, then.action_value) |
316 |
return HttpResponse(simplejson.dumps(response_data), mimetype='application/json')
|
|
315 |
return HttpResponse(json.dumps(response_data), mimetype='application/json') |
|
317 | 316 |
else: |
318 | 317 |
return render_to_response('add_rate_limit.html', {'form': form,}, |
319 | 318 |
context_instance=RequestContext(request)) |
... | ... | |
333 | 332 |
response_data = {} |
334 | 333 |
response_data['value'] = "%s" %port.pk |
335 | 334 |
response_data['text'] = "%s" %port.port |
336 |
return HttpResponse(simplejson.dumps(response_data), mimetype='application/json')
|
|
335 |
return HttpResponse(json.dumps(response_data), mimetype='application/json') |
|
337 | 336 |
else: |
338 | 337 |
return render_to_response('add_port.html', {'form': form,}, |
339 | 338 |
context_instance=RequestContext(request)) |
b/poller/views.py | ||
---|---|---|
4 | 4 |
import json |
5 | 5 |
|
6 | 6 |
import uuid |
7 |
import simplejson |
|
8 | 7 |
import datetime |
9 | 8 |
from django.shortcuts import render_to_response |
10 | 9 |
from django.template.loader import render_to_string |
... | ... | |
34 | 33 |
|
35 | 34 |
def json_response(value, **kwargs): |
36 | 35 |
kwargs.setdefault('content_type', 'text/javascript; charset=UTF-8') |
37 |
return HttpResponse(simplejson.dumps(value), **kwargs)
|
|
36 |
return HttpResponse(json.dumps(value), **kwargs) |
|
38 | 37 |
|
39 | 38 |
class Msgs(object): |
40 | 39 |
cache_size = 500 |
Also available in: Unified diff