Dyomedea
/
binder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up delete_record view using formdeletecord

This commit is contained in:
Jeffrey Forman 2012-11-23 22:42:37 -05:00
parent c42009f714
commit c492fb508c
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
binder/views.py
View File

@ -1,9 +1,7 @@
from binder import exceptions, forms, helpers, models
from django.shortcuts import redirect, render from django.shortcuts import redirect, render
from binder import exceptions, forms, helpers, models
import re # Views
RE_UNICODEARRAY = re.compile(r"u'(.*?)'")
def home_index(request): def home_index(request):
""" List the main index page for Binder. """ """ List the main index page for Binder. """
@ -34,8 +32,6 @@ def view_server_zones(request, dns_server):
def view_zone_records(request, dns_server, zone_name): def view_zone_records(request, dns_server, zone_name):
""" Display the list of records for a particular zone. """ """ Display the list of records for a particular zone. """
# Have we tried here to transfer for a zone that does not exist?
# Try with a transfer key and without.
try: try:
this_server = models.BindServer.objects.get(hostname=dns_server) this_server = models.BindServer.objects.get(hostname=dns_server)
zone_array = this_server.list_zone_records(zone_name) zone_array = this_server.list_zone_records(zone_name)
@ -108,7 +104,7 @@ def view_add_cname_result(request):
add_cname_response = helpers.add_cname_record( add_cname_response = helpers.add_cname_record(
cd["dns_server"], cd["dns_server"],
cd["zone_name"], cd["zone_name"],
str(cd["originating_record"]), # This needs to be cast as a String for some reason. str(cd["originating_record"]),
cd["cname"], cd["cname"],
cd["ttl"], cd["ttl"],
cd["key_name"]) cd["key_name"])
@ -129,35 +125,35 @@ def view_add_cname_result(request):
def view_delete_record(request): def view_delete_record(request):
""" Provide the initial form for deleting records. """ """ Provide the initial form for deleting records. """
if request.method == "GET": if request.method == "GET":
# Return home. You shouldn't trying to directly acces
# the url for deleting records.
return redirect("/") return redirect("/")
dns_server = request.POST["dns_server"] dns_server = request.POST["dns_server"]
zone_name = request.POST["zone_name"] zone_name = request.POST["zone_name"]
rr_array = request.POST.getlist("rr_array") rr_list = request.POST.getlist("rr_list")
return render(request, "bcommon/delete_record_initial.htm", return render(request, "bcommon/delete_record_initial.htm",
{ "dns_server" : dns_server, { "dns_server" : dns_server,
"zone_name" : zone_name, "zone_name" : zone_name,
"rr_array" : rr_array, "rr_list" : rr_list,
"tsig_keys" : models.Key.objects.all() }) "tsig_keys" : models.Key.objects.all() })
def view_delete_result(request): def view_delete_result(request):
""" View that deletes records and returns the response. """ """ View that deletes records and returns the response. """
if request.method == "GET": if request.method == "GET":
# Return home. You shouldn't trying to directly access
# the url for deleting records.
return redirect("/") return redirect("/")
# What seems like an ugly hack to get around the fact form = forms.FormDeleteRecord(request.POST)
# that the array comes back as Unicode values.
# TODO: Can we make this cleaner?
rr_unicode_array = request.POST.getlist("rr_array")[0]
rr_items = RE_UNICODEARRAY.findall(rr_unicode_array)
delete_result = helpers.delete_record(request.POST, rr_items) if form.is_valid():
clean_form = form.cleaned_data
else:
# TODO: Add unit test here.
print "form not valid"
delete_result = helpers.delete_record(clean_form["dns_server"],
clean_form["rr_list"],
clean_form["key_name"])
return render(request, "bcommon/response_result.htm", return render(request, "bcommon/response_result.htm",
{ "response" : delete_result }) { "response" : delete_result })