From 6878cfebde01892ba750f21750f1812fd6f8df75 Mon Sep 17 00:00:00 2001 From: Sebastian Lohff Date: Fri, 31 Mar 2017 03:26:10 +0200 Subject: [PATCH] Fixed domain detal viewing in search --- domains/models.py | 9 +++++++++ templates/whoisdb/handle_table.html | 4 ++-- whoisdb/models.py | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/domains/models.py b/domains/models.py index 8ba7082..d8d609a 100644 --- a/domains/models.py +++ b/domains/models.py @@ -30,6 +30,9 @@ class Nameserver(MntdObject): def __str__(self): return self.name + def getAppName(self): + return "domains" + def getNoDeleteReasons(self): # nameservers can always be deleted return [] @@ -52,6 +55,9 @@ class Domain(MntdObject): def __str__(self): return self.name + def getAppName(self): + return "domains" + def getNoDeleteReasons(self): reasons = [] @@ -85,6 +91,9 @@ class ReverseZone(WhoisObject): def get_absolute_url(self): return reverse("domains:reversezone-show", args=(self.pk,)) + def getAppName(self): + return "domains" + def __str__(self): return "%s @ %s" % (self.prefix(), self.parentNet) diff --git a/templates/whoisdb/handle_table.html b/templates/whoisdb/handle_table.html index 51e2ee0..3b7a565 100644 --- a/templates/whoisdb/handle_table.html +++ b/templates/whoisdb/handle_table.html @@ -9,8 +9,8 @@ {% if object|userCanEdit:user %} Actions - {% with request.resolver_match.namespaces.0|add:":"|add:object.getClassName|lower|add:"-edit" as editView %} - {% with request.resolver_match.namespaces.0|add:":"|add:object.getClassName|lower|add:"-delete" as deleteView %} + {% with object.getAppName|add:":"|add:object.getClassName|lower|add:"-edit" as editView %} + {% with object.getAppName|add:":"|add:object.getClassName|lower|add:"-delete" as deleteView %} Edit object, Delete object {% endwith %} {% endwith %} diff --git a/whoisdb/models.py b/whoisdb/models.py index a8e06cd..8f4ee57 100644 --- a/whoisdb/models.py +++ b/whoisdb/models.py @@ -34,6 +34,9 @@ class WhoisObject(models.Model): def __str__(self): return self.handle + def getAppName(self): + return "whoisdb" + def getClassName(self): return self._meta.object_name