From adc034f8f016c2e45064a9ffd27b5741edc3e77d Mon Sep 17 00:00:00 2001
From: Sebastian Lohff <seba@someserver.de>
Date: Tue, 21 Mar 2017 19:34:02 +0100
Subject: [PATCH] Noot

---
 domains/models.py  | 6 ++++++
 domains/views.py   | 4 +++-
 whoisdb/helpers.py | 9 ++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/domains/models.py b/domains/models.py
index 57ae658..c39ad84 100644
--- a/domains/models.py
+++ b/domains/models.py
@@ -74,3 +74,9 @@ class ReverseZone(models.Model):
 
 	def getNoDeleteReasons(self):
 		return []
+
+	def canEdit(self, user):
+		if self.parentNet:
+			return self.parentNet.canEdit(user)
+		else:
+			return False
diff --git a/domains/views.py b/domains/views.py
index 766c5a2..848d99f 100644
--- a/domains/views.py
+++ b/domains/views.py
@@ -79,7 +79,8 @@ class NameserverDetail(LoginRequiredMixin, DetailView):
 	model = Nameserver
 	slug_field = "name"
 	slug_url_kwarg = "domain"
-	context_object_name = "nameserver"
+	#context_object_name = "nameserver"
+	template_name = "domains/handle_show.html"
 
 
 class NameserverEdit(MntGenericMixin, LoginRequiredMixin, UpdateView):
@@ -119,6 +120,7 @@ class ReverseZoneDetail(LoginRequiredMixin, DetailView):
 	slug_field = "name"
 	slug_url_kwarg = "domain"
 	context_object_name = "nameserver"
+	template_name = "domains/handle_show.html"
 
 
 class ReverseZoneEdit(MntGenericMixin, LoginRequiredMixin, UpdateView):
diff --git a/whoisdb/helpers.py b/whoisdb/helpers.py
index 0ad8119..de25cb6 100644
--- a/whoisdb/helpers.py
+++ b/whoisdb/helpers.py
@@ -9,7 +9,7 @@ def _addFields(fields, obj, fieldNames):
 def getWhoisObjectFields(obj, owner):
 	fields = []
 
-	if getattr(obj, "handle"):
+	if hasattr(obj, "handle"):
 		_addFields(fields, obj, ["handle"])
 
 	c = type(obj)
@@ -22,9 +22,9 @@ def getWhoisObjectFields(obj, owner):
 	elif c == whoisdb.models.ASBlock:
 		_addFields(fields, obj, ["name"])
 		fields.append(("AS Range", "%s - %s" % (obj.asBegin, obj.asEnd)))
-		_addFields(fields, obj, ["description", "mnt_by", "mnt_lower", "admin_c"])
+		_addFields(fields, obj, ["description", "parent_block", "mnt_by", "mnt_lower", "admin_c"])
 	elif c == whoisdb.models.ASNumber:
-		_addFields(fields, obj, ["name", "number", "description", "mnt_by", "mnt_lower", "admin_c"])
+		_addFields(fields, obj, ["name", "number", "description", "volatile", "mnt_by", "mnt_lower", "admin_c"])
 	elif c == whoisdb.models.InetNum:
 		_addFields(fields, obj, ["name"])
 		fields.append(("Address CIDR", obj.prefix()))
@@ -40,3 +40,6 @@ def getWhoisObjectFields(obj, owner):
 
 	return fields
 
+def guessWhoisObject(self, handle):
+	# is it a normal handle?
+	pass