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

clean up how we parse multiple items in the selected list when deleting multiple records

This commit is contained in:
jeffrey forman 2015-03-31 21:43:26 -04:00
parent 0da5e9ba89
commit 6557f2c099
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binder/forms.py
View File

@ -2,7 +2,7 @@
# 3rd Party # 3rd Party
from django import forms from django import forms
from django.core.exceptions import ValidationError from django.forms import ValidationError
# App Imports # App Imports
from models import Key from models import Key
@ -14,11 +14,9 @@ class CustomUnicodeListField(forms.CharField):
""" Convert unicode item list to list of strings. """ """ Convert unicode item list to list of strings. """
def clean(self, value): def clean(self, value):
try: try:
first_parse = eval(value) string_list = [str(cur_rr) for cur_rr in eval(value)]
string_list = [current_item for current_item in first_parse]
except: except:
raise ValidationError("Error in converting Unicode list to list of Strings: %r" % value) raise ValidationError("Error in converting Unicode list to list of Strings: %r" % value)
return string_list return string_list
class CustomStringPeriodSuffix(forms.CharField): class CustomStringPeriodSuffix(forms.CharField):
@ -73,5 +71,5 @@ class FormDeleteRecord(forms.Form):
""" Final form to delete DNS record(s). """ """ Final form to delete DNS record(s). """
dns_server = forms.CharField(max_length=100) dns_server = forms.CharField(max_length=100)
zone_name = forms.CharField(max_length=256) zone_name = forms.CharField(max_length=256)
rr_list = CustomUnicodeListField(required=False) rr_list = CustomUnicodeListField()
key_name = forms.ModelChoiceField(queryset=Key.objects.all(), required=False) key_name = forms.ModelChoiceField(queryset=Key.objects.all(), required=False)

4
binder/helpers.py
View File

@ -94,9 +94,9 @@ def delete_record(dns_server, rr_list, key_name):
delete_response = [] delete_response = []
for current_rr in rr_list: for current_rr in rr_list:
record_list = current_rr.split(".") record_list = current_rr.split(".", 1)
record = record_list[0] record = record_list[0]
domain = ".".join(record_list[1:]) domain = record_list[1]
dns_update = dns.update.Update(domain, keyring=keyring, keyalgorithm=algorithm) dns_update = dns.update.Update(domain, keyring=keyring, keyalgorithm=algorithm)
dns_update.delete(record) dns_update.delete(record)
output = send_dns_update(dns_update, dns_server, key_name) output = send_dns_update(dns_update, dns_server, key_name)