From baa2dcc38b9c84347f9bdf90513d9f385dd63357 Mon Sep 17 00:00:00 2001 From: Sebastian Lohff Date: Mon, 20 Mar 2017 00:16:33 +0100 Subject: [PATCH] Zwischencommit --- dnmgmt/settings.py | 2 +- rrequests/forms.py | 2 +- rrequests/models.py | 2 +- rrequests/views.py | 7 ++- templates/base.html | 2 +- templates/dncore/dashboard.html | 14 ++--- templates/index.html | 17 ++---- templates/rrequests/list.html | 45 ++++++++++++---- templates/rrequests/request_create.html | 2 +- templates/rrequests/request_detail.html | 16 ++++-- templates/whoisdb/contact_detail.html | 2 +- templates/whoisdb/create_overview.html | 30 +++++++++++ templates/whoisdb/handle_show.html | 34 ++++++++++++ templates/whoisdb/handle_table_row.html | 10 ++-- templates/whoisdb/maintainer_detail.html | 8 ++- templates/whoisdb/obj_create.html | 2 +- templates/whoisdb/obj_delete.html | 8 +-- templates/whoisdb/overview.html | 20 +++++-- whoisdb/forms.py | 4 +- whoisdb/helpers.py | 33 ++++++++++++ whoisdb/models.py | 35 +++++++++++-- whoisdb/models_crap.py | 67 ------------------------ whoisdb/templatetags/__init__.py | 0 whoisdb/templatetags/handletags.py | 37 +++++++++++++ whoisdb/urls.py | 8 +++ whoisdb/views.py | 30 +++++++++-- 26 files changed, 304 insertions(+), 133 deletions(-) create mode 100644 templates/whoisdb/create_overview.html create mode 100644 templates/whoisdb/handle_show.html create mode 100644 whoisdb/helpers.py delete mode 100644 whoisdb/models_crap.py create mode 100644 whoisdb/templatetags/__init__.py create mode 100644 whoisdb/templatetags/handletags.py diff --git a/dnmgmt/settings.py b/dnmgmt/settings.py index f5de88c..80944e6 100644 --- a/dnmgmt/settings.py +++ b/dnmgmt/settings.py @@ -26,7 +26,7 @@ SECRET_KEY = 'b96*sagnglcd8xe&8&cm6g-(onalk(ps3u!c1l3#_(-w64w35)' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["*"] # Application definition diff --git a/rrequests/forms.py b/rrequests/forms.py index 00b1528..ad60c25 100644 --- a/rrequests/forms.py +++ b/rrequests/forms.py @@ -26,7 +26,7 @@ class RequestForm(forms.Form): def clean(self): cleaned_data = super(RequestForm, self).clean() - if not forms.errors: + if not self.errors: mnts = self._user.maintainer_set.all() if cleaned_data['applicant'] in mnts and cleaned_data['provider'] in mnts: raise forms.ValidationError("You could request resources from yourself, but this would actually not make that much sense.") diff --git a/rrequests/models.py b/rrequests/models.py index 7af31b0..871ab8f 100644 --- a/rrequests/models.py +++ b/rrequests/models.py @@ -31,7 +31,7 @@ class Request(models.Model): return reverse("rrequests:show", args=(self.pk,)) def __str__(self): - return "(%s -> %s) [%s] %s" % (self.applicant, self.provider, self.state, self.subject) + return "(%s -> %s) [%s] %s" % (self.applicant, self.provider, self.status, self.subject) class RequestMessage(models.Model): diff --git a/rrequests/views.py b/rrequests/views.py index 4d55df9..bd21090 100644 --- a/rrequests/views.py +++ b/rrequests/views.py @@ -15,8 +15,9 @@ def listRequests(request): mnts = request.user.maintainer_set.all() requestedFromMe = Request.objects.filter(applicant=mnts) requestedToMe = Request.objects.filter(provider__in=mnts) + requests = (requestedFromMe | requestedToMe).order_by("-lastAction") - return render(request, "rrequests/list.html", {"requestedFromMe": requestedFromMe, "requestedToMe": requestedToMe}) + return render(request, "rrequests/list.html", {"requests": requests, "requestedFromMe": requestedFromMe, "requestedToMe": requestedToMe}) class RrequestCreate(LoginRequiredMixin, FormView): @@ -79,6 +80,10 @@ def rrequestDetail(request, pk): msg.save() + if "createdResources" in form.cleaned_data and \ + form.cleaned_data['createdResources'].strip() != "": + reqObj.grantedResources = form.cleaned_data["createdResources"].strip() + reqObj.lastAction = timezone.now() reqObj.save() diff --git a/templates/base.html b/templates/base.html index fc2f371..f8ac19c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -52,7 +52,7 @@
  • diff --git a/templates/dncore/dashboard.html b/templates/dncore/dashboard.html index e4c0dae..84f581f 100644 --- a/templates/dncore/dashboard.html +++ b/templates/dncore/dashboard.html @@ -1,5 +1,7 @@ {% extends "base.html" %} +{% load handletags %} + {% block content %}
    @@ -25,7 +27,7 @@ {% for asn in asns %} - {{ asn.handle }} + {{ asn|linkObject }} {{ asn.number }} {% endfor %} @@ -42,13 +44,13 @@ {% for inetnum in inetnums %} - {{ inetnum.handle }} + {{ inetnum|linkObject }} {{ inetnum.prefix }} {% endfor %} {% else %} -

    You don't have any AS numbers

    +

    You don't have any domains

    {% endif %} @@ -66,12 +68,12 @@ {% for domain in domains %} - {{ domain.name }} + {{ domain|linkObject }} {% endfor %} {% else %} -

    You don't have any AS numbers

    +

    You don't have any open resource requests

    {% endif %}
    @@ -89,7 +91,7 @@ {% for rrequest in rrequests %} {{ rrequest.applicant }} {{ rrequest.provider }} - {{ rrequest.subject }} + {{ rrequest.subject }} {% endfor %} diff --git a/templates/index.html b/templates/index.html index f4bfc53..907a22f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -5,24 +5,13 @@ {% block content %}
    -
    -
    -

    Participate!

    -
    -
    -
    -
    -
    +
    -

    Login

    +

    Empty landing page!

    + Click on dashboard above to get an overview.
    - -
    -
    -
    -
    {% endblock %} diff --git a/templates/rrequests/list.html b/templates/rrequests/list.html index 2f550c0..59f3f4a 100644 --- a/templates/rrequests/list.html +++ b/templates/rrequests/list.html @@ -1,5 +1,7 @@ {% extends "base.html" %} +{% load handletags %} + {% block content %}
    @@ -7,20 +9,41 @@
    Resource Requests

    - Create resource request + Start a new request for resources

    +

    - Requests to you -

      - {% for r in requestedFromMe %} - {% endfor %} -
    - + Current and old resource requests:

    + +

    + + + + + + + + + + + + {% for request in requests %} + + + + + + + + + + + {% endfor %} +
    ApplicantProviderStatusSubjectCreated atLast ModifiedResources
    {{ request.applicant|linkObject }}{{ request.provider|linkObject }}{{ request.get_status_display }}{{ request.subject }}{{ request.created }}{{ request.lastAction }}{{ request.grantedResources|default:"-" }}View
    +

    + +
    diff --git a/templates/rrequests/request_create.html b/templates/rrequests/request_create.html index 691f4df..06a4ec1 100644 --- a/templates/rrequests/request_create.html +++ b/templates/rrequests/request_create.html @@ -6,7 +6,7 @@
    -
    Header
    +
    Start New Resource Request
    {% csrf_token %} diff --git a/templates/rrequests/request_detail.html b/templates/rrequests/request_detail.html index 0c61cdb..08ad9d0 100644 --- a/templates/rrequests/request_detail.html +++ b/templates/rrequests/request_detail.html @@ -6,16 +6,22 @@
    -
    Header
    +
    Resource Request - {{ request.subject }} - {{ request.applicant }} {{ request.provider }}
    -

    {{ request.subject }}

    +

    {{ request.subject }}

    {% for message in request.requestmessage_set.all %} -

    {{ message.creator }} {{ message.created }}

    - {{ message.message | linebreaks }} +
    +
    From {{message.creator }} at {{ message.created }}
    +
    + {{ message.message | linebreaks }} +
    +
    {% if message.statusChanged %} - Status changed to {{ message.statusChanged }}. + {% endif %} {% endfor %}

    diff --git a/templates/whoisdb/contact_detail.html b/templates/whoisdb/contact_detail.html index ac2c415..587097e 100644 --- a/templates/whoisdb/contact_detail.html +++ b/templates/whoisdb/contact_detail.html @@ -4,7 +4,7 @@
    -
    Header
    +
    Contact {{ handle }}
    {{ contact }}
    diff --git a/templates/whoisdb/create_overview.html b/templates/whoisdb/create_overview.html new file mode 100644 index 0000000..fde5065 --- /dev/null +++ b/templates/whoisdb/create_overview.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} + +{% load crispy_forms_tags %} +{% load handletags %} + +{% block content %} +
    +
    +
    +
    Whois Database Objects
    +
    +

    Create Database Objects

    + +
    +
    +
    +
    +{% endblock %} + diff --git a/templates/whoisdb/handle_show.html b/templates/whoisdb/handle_show.html new file mode 100644 index 0000000..ce5acca --- /dev/null +++ b/templates/whoisdb/handle_show.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} + +{% load handletags %} + +{% block content %} +
    +
    +
    +
    {{ object }} ({{ object.getClassName }})
    +
    + + {% for field in object|getFields:user %} + + + + + {% endfor %} + {% if object|userCanEdit:user %} + + + {% with "whoisdb:"|add:object.getClassName|lower|add:"-edit" as editView %} + {% with "whoisdb:"|add:object.getClassName|lower|add:"-delete" as deleteView %} + + {% endwith %} + {% endwith %} + + {% endif %} +
    {{ field.0 }}{% if field.1.through %}{{ field.1.all|linkObjects }}{% else %}{{ field.1 }}{% endif %}
    ActionsEdit object, Delete object
    +
    +
    +
    +
    +{% endblock %} + diff --git a/templates/whoisdb/handle_table_row.html b/templates/whoisdb/handle_table_row.html index a1ffbbe..e2792a9 100644 --- a/templates/whoisdb/handle_table_row.html +++ b/templates/whoisdb/handle_table_row.html @@ -1,11 +1,15 @@ +{% load handletags %} + {% with "whoisdb:"|add:prefix|add:"-detail" as detailView %} {% with "whoisdb:"|add:prefix|add:"-delete" as deleteView %} {% with "whoisdb:"|add:prefix|add:"-edit" as editView %} - {{ obj.handle }} + {{ obj|linkObject }} {{ objType }} - {{obj.name }}{{ obj.description }} - {% for contact in obj.admin_c.all %}{{ contact }} {% endfor %} + {{ obj.name }}{{ obj.description }} + {{ obj.getResource|default:"-" }} + {{ obj.mnt_by.all|linkObjects|default:"-" }}{% if obj.mnt_lower.all %} / lower: {{ obj.mnt_lower.all|linkObjects }}{% endif %} + {{ obj.admin_c.all|linkObjects }} Edit Delete {% endwith %} diff --git a/templates/whoisdb/maintainer_detail.html b/templates/whoisdb/maintainer_detail.html index 5dbfd9e..f454717 100644 --- a/templates/whoisdb/maintainer_detail.html +++ b/templates/whoisdb/maintainer_detail.html @@ -1,12 +1,16 @@ {% extends "base.html" %} +{% load handletags %} + {% block content %}
    -
    Header
    +
    {{ mnt }} (Maintainer)
    - {{ mnt }} + {% for field in mnt|getFields %} + {{ field }} + {% endfor %}
    diff --git a/templates/whoisdb/obj_create.html b/templates/whoisdb/obj_create.html index 691f4df..307ff1f 100644 --- a/templates/whoisdb/obj_create.html +++ b/templates/whoisdb/obj_create.html @@ -6,7 +6,7 @@
    -
    Header
    +
    Create New Whois Database Object
    {% csrf_token %} diff --git a/templates/whoisdb/obj_delete.html b/templates/whoisdb/obj_delete.html index fb02616..23f27ed 100644 --- a/templates/whoisdb/obj_delete.html +++ b/templates/whoisdb/obj_delete.html @@ -6,7 +6,7 @@
    -
    Header
    +
    Delete {{ object }}?
    {% if reasons %}

    @@ -19,10 +19,12 @@ {% endfor %} {% else %} - {{ obj }} +

    + Are you sure you want to delete {{ object }}? +

    {% csrf_token %} - + {% endif %}
    diff --git a/templates/whoisdb/overview.html b/templates/whoisdb/overview.html index d218d42..7e39e09 100644 --- a/templates/whoisdb/overview.html +++ b/templates/whoisdb/overview.html @@ -1,14 +1,24 @@ {% extends "base.html" %} {% load crispy_forms_tags %} +{% load handletags %} {% block content %}
    -
    Header
    +
    Whois Database Objects
    {% if mnts %} +

    + You can create new database objects here. +

    + +

    + Create new Maintainer, create new Contact, request resources{% if netblocks %}, create Subnet{% endif %}{% if asblocks %}, create AS, create ASblock{% endif %} +

    + - + + + diff --git a/whoisdb/forms.py b/whoisdb/forms.py index 39a83b5..33a8250 100644 --- a/whoisdb/forms.py +++ b/whoisdb/forms.py @@ -97,7 +97,7 @@ class InetNumForm(MntFormMixin, WhoisObjectFormMixin, forms.ModelForm): class Meta: model = InetNum - fields = ['handle', 'protocol', 'parent_range', 'prefix', 'name', 'description', 'mnt_by', 'mnt_lower'] + fields = ['handle', 'protocol', 'parent_range', 'prefix', 'name', 'description', 'mnt_by', 'mnt_lower', 'admin_c'] def __init__(self, *args, **kwargs): super(InetNumForm, self).__init__(*args, **kwargs) @@ -167,7 +167,7 @@ class ASBlockForm(MntFormMixin, WhoisObjectFormMixin, forms.ModelForm): # FIXME: Filter blocks class Meta: model = ASBlock - fields = ['handle', 'parent_block', 'asBegin', 'asEnd', 'name', 'description', 'mnt_by', 'mnt_lower'] + fields = ['handle', 'parent_block', 'asBegin', 'asEnd', 'name', 'description', 'mnt_by', 'mnt_lower', 'admin_c'] def __init__(self, *args, **kwargs): super(ASBlockForm, self).__init__(*args, **kwargs) diff --git a/whoisdb/helpers.py b/whoisdb/helpers.py new file mode 100644 index 0000000..2ae8e66 --- /dev/null +++ b/whoisdb/helpers.py @@ -0,0 +1,33 @@ +import whoisdb.models + +def _addFields(fields, obj, fieldNames): + for fieldName in fieldNames: + fields.append((fieldName.capitalize(), getattr(obj, fieldName))) + + +def getWhoisObjectFields(obj, owner): + fields = [] + + if getattr(obj, "handle"): + _addFields(fields, obj, ["handle"]) + + c = type(obj) + if c == whoisdb.models.Maintainer: + _addFields(fields, obj, ["admin_c"]) + if owner: + _addFields(fields, obj, ["auth"]) + elif c == whoisdb.models.Contact: + _addFields(fields, obj, ["name", "mnt_by"]) + 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"]) + elif c == whoisdb.models.ASNumber: + _addFields(fields, obj, ["name", "number", "description", "mnt_by", "mnt_lower", "admin_c"]) + elif c == whoisdb.models.InetNum: + _addFields(fields, obj, ["name"]) + fields.append(("Address CIDR", obj.prefix())) + _addFields(fields, obj, ["description", "mnt_by", "mnt_lower", "admin_c"]) + + return fields + diff --git a/whoisdb/models.py b/whoisdb/models.py index 358e1ff..37db7a3 100644 --- a/whoisdb/models.py +++ b/whoisdb/models.py @@ -19,6 +19,9 @@ class WhoisObject(models.Model): def __str__(self): return self.handle + def getClassName(self): + return self._meta.object_name + def genHandle(self, main=None): if not main: main = self.name @@ -74,7 +77,7 @@ class Maintainer(WhoisObject): # autoInclude = models.BooleanField(default=True) def get_absolute_url(self): - return reverse("whoisdb:mnt-detail", kwargs={"handle": self.handle}) + return reverse("whoisdb:handle-detail", kwargs={"handle": self.handle}) def getNoDeleteReasons(self): reasons = [] @@ -87,6 +90,9 @@ class Maintainer(WhoisObject): return reasons + def canEdit(self, user): + return user in self.auth.all() + class MntdObject(WhoisObject): class Meta: @@ -94,6 +100,17 @@ class MntdObject(WhoisObject): mnt_by = models.ManyToManyField(Maintainer) + def canEdit(self, user): + mnts = user.maintainer_set.all() + objmnts = self.mnt_by.all() + if hasattr(self, "mnt_lower"): + objmnts |= self.mnt_lower.all() + + for objmnt in objmnts: + if objmnt in mnts: + return True + return False + class Contact(MntdObject): handleSuffix = "DN" @@ -106,7 +123,7 @@ class Contact(MntdObject): type = models.CharField(max_length=10, choices=TYPE, default=TYPE_PERSON) def get_absolute_url(self): - return reverse("whoisdb:contact-detail", kwargs={"handle": self.handle}) + return reverse("whoisdb:handle-detail", kwargs={"handle": self.handle}) def getNoDeleteReasons(self): reasons = [] @@ -132,8 +149,11 @@ class ASBlock(MntdObject): mnt_lower = models.ManyToManyField(Maintainer, related_name='lower_asblock_set', blank=True) + def getResource(self): + return "%s - %s" % (self.asBegin, self.asEnd) + def get_absolute_url(self): - return reverse("whoisdb:asblock-detail", kwargs={"handle": self.handle}) + return reverse("whoisdb:handle-detail", kwargs={"handle": self.handle}) def getNoDeleteReasons(self): reasons = [] @@ -160,13 +180,15 @@ class ASNumber(MntdObject): mnt_lower = models.ManyToManyField(Maintainer, related_name='lower_asnumber_set', blank=True) def get_absolute_url(self): - return reverse("whoisdb:asnumber-detail", kwargs={"handle": self.handle}) + return reverse("whoisdb:handle-detail", kwargs={"handle": self.handle}) def getNoDeleteReasons(self): reasons = [] return reasons + def getResource(self): + return str(self.number) class InetNum(MntdObject): handleSuffix = "NET" @@ -185,6 +207,9 @@ class InetNum(MntdObject): mnt_lower = models.ManyToManyField(Maintainer, related_name='lower_inetnum_set', blank=True) + def getResource(self): + return self.prefix() + def prefix(self): """ Helper function, mainly used in templates """ return "%s/%s" % (self.address, self.netmask) @@ -193,7 +218,7 @@ class InetNum(MntdObject): return ipaddress.ip_network(self.prefix()) def get_absolute_url(self): - return reverse("whoisdb:inetnum-detail", kwargs={"handle": self.handle}) + return reverse("whoisdb:handle-detail", kwargs={"handle": self.handle}) def getNoDeleteReasons(self): reasons = [] diff --git a/whoisdb/models_crap.py b/whoisdb/models_crap.py deleted file mode 100644 index f3c7265..0000000 --- a/whoisdb/models_crap.py +++ /dev/null @@ -1,67 +0,0 @@ -from django.db import models - -from dncore.models import User -from .validators import HandleValidator - -class ExtraFields(models.Model): - name = models.CharField(max_length=64) - value = models.CharField(max_length=128) - - order = models.PositiveSmallIntegerField() - -class WhoisObject(models.Model): - handle_suffix = None - whois_fields = None - whois_extra_field_names = None - - handle = models.SlugField(max_length='32', unique=True, validators=[HandleValidator()]) - created = models.DateTimeField(auto_add_now=True) - last_modified = models.DateTimeField(auto_add_now=True) - - class Meta: - abstract = True - -class Maintainer(WhoisObject): - auth = models.ManyToManyField(User) - - admin_c = models.ManyToManyField("Contact") - -class MntdObject(WhoisObject): - mnt_by = models.ManyToManyField(Maintainer) - - class Meta: - abstract = True - - -class Contact(MntdObject): - TYPE = (('person', 'person'), ('role', 'role')) - - name = models.CharField(max_length=128) - -class MntdCObject(MntdObject) - admin_c = models.ManyToManyField("Contact") - - class Meta: - abstract = True - -class MntdObject(WhoisObject): - admin_c = models.ManyToManyField(Contact) - mnt_by = models - - class Meta: - abstract = True - - - - -class ASNumber(WhoisObject): - number = models.PositiveIntegerField(unique=True, db_index=True) - - -class InetNum(WhoisObject): - PROTO = (('ipv4', 'ipv4'), ('ipv6', 'ipv6')) - protocol = models.CharField(max_length=4, choices=PROTO) - netmask = models.PositiveIntegerField() - -#class ASBlock(WhoisObject): -# pass diff --git a/whoisdb/templatetags/__init__.py b/whoisdb/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/whoisdb/templatetags/handletags.py b/whoisdb/templatetags/handletags.py new file mode 100644 index 0000000..3dec8f5 --- /dev/null +++ b/whoisdb/templatetags/handletags.py @@ -0,0 +1,37 @@ +from django import template +from django.utils.safestring import mark_safe + +from whoisdb.helpers import getWhoisObjectFields + +register = template.Library() + +@register.filter +def linkObject(value): + return mark_safe('%s' % (value.get_absolute_url(), str(value))) + +@register.filter +def linkObjects(value): + links = [] + for obj in value: + if hasattr(obj, "get_absolute_url"): + links.append('%s' % (obj.get_absolute_url(), str(obj))) + else: + links.append(str(obj)) + + return mark_safe(", ".join(links)) + +@register.filter +def getFields(value, user): + print("User is", user) + + owner = value.canEdit(user) + + return getWhoisObjectFields(value, owner) + #return [("Handle", value.handle), ("Auth", value.auth)] + + +@register.filter +def userCanEdit(value, user): + if hasattr(value, "canEdit"): + return value.canEdit(user) + return False diff --git a/whoisdb/urls.py b/whoisdb/urls.py index 4a69776..6f47742 100644 --- a/whoisdb/urls.py +++ b/whoisdb/urls.py @@ -4,11 +4,19 @@ from . import views as whoisdb_views urlpatterns = [ url(r'^$', whoisdb_views.dbDashboard, name='dashboard'), + url(r'^create/$', whoisdb_views.createObjectOverview, name='createObjectOverview'), + url(r'^handle/(?P[A-Z0-9-]+)/$', whoisdb_views.showHandle, name='showhandle'), + url(r'^handle/(?P[A-Z0-9-]+)/$', whoisdb_views.showHandle, name='handle-detail'), url(r'^mnt/create/$', whoisdb_views.MaintainerCreate.as_view(), name='mnt-create'), url(r'^mnt/show/(?P[A-Z0-9-]+)/$', whoisdb_views.MaintainerDetail.as_view(), name='mnt-detail'), url(r'^mnt/edit/(?P[A-Z0-9-]+)/$', whoisdb_views.MaintainerEdit.as_view(), name='mnt-edit'), url(r'^mnt/delete/(?P[A-Z0-9-]+)/$', whoisdb_views.MaintainerDelete.as_view(), name='mnt-delete'), + # FIXME hacky duplicates + url(r'^mnt/create/$', whoisdb_views.MaintainerCreate.as_view(), name='mnt-create'), + url(r'^mnt/show/(?P[A-Z0-9-]+)/$', whoisdb_views.MaintainerDetail.as_view(), name='maintainer-detail'), + url(r'^mnt/edit/(?P[A-Z0-9-]+)/$', whoisdb_views.MaintainerEdit.as_view(), name='maintainer-edit'), + url(r'^mnt/delete/(?P[A-Z0-9-]+)/$', whoisdb_views.MaintainerDelete.as_view(), name='maintainer-delete'), url(r'^contact/create/$', whoisdb_views.ContactCreate.as_view(), name='contact-create'), url(r'^contact/show/(?P[A-Z0-9-]+)/$', whoisdb_views.ContactDetail.as_view(), name='contact-detail'), diff --git a/whoisdb/views.py b/whoisdb/views.py index 221a24b..e2450b5 100644 --- a/whoisdb/views.py +++ b/whoisdb/views.py @@ -1,7 +1,7 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 from django.db.models import Q from django.contrib.auth.decorators import login_required -from django.http import HttpResponseRedirect +from django.http import HttpResponseRedirect, Http404 from django.urls import reverse, reverse_lazy from django.views.generic import DetailView, CreateView, UpdateView from django.contrib.auth.mixins import LoginRequiredMixin @@ -10,6 +10,13 @@ from .models import Maintainer, Contact, InetNum, ASBlock, ASNumber from .forms import MntForm, MntInitialForm, ContactForm, ContactInitialForm, InetNumForm, ASBlockForm, ASNumberForm from .generic import DeleteCheckView, MntGenericMixin +@login_required +def createObjectOverview(request): + mnts = request.user.maintainer_set.all() + netblocks = InetNum.objects.filter(Q(mnt_by__in=mnts) | Q(mnt_lower__in=mnts)).distinct() + asblocks = ASBlock.objects.filter(Q(mnt_by__in=mnts) | Q(mnt_lower__in=mnts)).distinct() + + return render(request, "whoisdb/create_overview.html", {"netblocks": netblocks, "asblocks": asblocks}) @login_required def dbDashboard(request): @@ -49,6 +56,22 @@ def dbDashboard(request): return render(request, "whoisdb/overview.html", {"mnts": mnts, "contacts": contacts, "mntForm": mntForm, "contactForm": contactForm, "netblocks": netblocks, "asblocks": asblocks, "asnumbers": asnumbers}) +def showHandle(request, handle): + # a) find handle + models = [Contact, Maintainer, ASBlock, ASNumber, InetNum] + obj = None + + for model in models: + if handle.endswith(model.handleSuffix): + obj = get_object_or_404(model, handle=handle) + break + + if not obj: + raise Http404("Handle object not found") + + return render(request, "whoisdb/handle_show.html", {"object": obj}) + + class MaintainerCreate(LoginRequiredMixin, CreateView): template_name = "whoisdb/obj_create.html" form_class = MntForm @@ -100,10 +123,11 @@ class MaintainerDelete(LoginRequiredMixin, DeleteCheckView): class MaintainerDetail(LoginRequiredMixin, DetailView): + template_name = "whoisdb/handle_show.html" model = Maintainer slug_field = "handle" slug_url_kwarg = "handle" - context_object_name = "mnt" + #context_object_name = "mnt" class ContactDetail(DetailView):
    Handle TypeName?NameResourceMaintained Contact Actions