From 5c453e9a8dca3c87251848130d1caaddb2dc153a Mon Sep 17 00:00:00 2001 From: Jeffrey Forman Date: Thu, 18 Oct 2012 06:34:22 -0400 Subject: [PATCH] deleting records works again. without tsig key. --- binder/bcommon/helpers.py | 7 ++++--- binder/templates/index.htm | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/binder/bcommon/helpers.py b/binder/bcommon/helpers.py index 3e13a7c..ac977b0 100644 --- a/binder/bcommon/helpers.py +++ b/binder/bcommon/helpers.py @@ -90,10 +90,11 @@ def add_record(form_data): return response def delete_record(form_data, rr_items): - try: + """Delete a list of DNS records passed as strings in rr_items.""" + if ("key_name" in form_data and form_data["key_name"]): keyring = create_keyring(form_data["key_name"]) - except Exception, err: - raise Exception("Error creating keyring in delete_record: %s" % err) + else: + keyring = None dns_server = form_data["dns_server"] delete_response = [] diff --git a/binder/templates/index.htm b/binder/templates/index.htm index 2704bbb..2312b50 100644 --- a/binder/templates/index.htm +++ b/binder/templates/index.htm @@ -1,5 +1,9 @@ {% extends "base.htm" %} +{% block pageheader %} +Home +{% endblock pageheader %} + {% block body %} TODO(jforman): Build some sort of dashboard here