bind: views show served domains in main view

Signed-off-by: Nektarios Katakis <iam@nektarioskatakis.xyz>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Nektarios Katakis 2020-02-04 14:21:46 +00:00 committed by James Valleroy
parent 5826d35ce5
commit d0fcc179a7
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 87 additions and 0 deletions

View File

@ -0,0 +1,55 @@
{% extends "app.html" %}
{% comment %}
#
# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
{% endcomment %}
{% load bootstrap %}
{% load i18n %}
{% block status %}
{{ block.super }}
<h3>{% trans "Serving Domains" %}</h3>
<table class="table table-bordered table-condensed table-striped">
<thead>
<tr>
<th>{% trans "Type" %}</th>
<th>{% trans "Domain Names" %}</th>
<th>{% trans "Serving" %}</th>
<th>{% trans "IP addresses" %}</th>
</tr>
</thead>
<tbody>
{% for domain in domains_table %}
<tr>
<td>{{ domain.type}}</td>
<td>{{ domain.domain_name}}</td>
<td>{{ domain.serving }}</td>
<td>{{ domain.ip_address }}</td>
</tr>
{% endfor %}
</tbody>
</table>
<div>
<a href="{% url 'bind:index' %}" class="btn btn-default"
role="button" title="{% trans 'Refresh IP address and domains' %}">
<span class="fa" aria-hidden="true"></span>
{% trans 'Refresh IP address and domains' %}
</a>
</div>
{% endblock %}

View File

@ -23,6 +23,7 @@ from django.utils.translation import ugettext_lazy as _
from plinth import actions
from plinth.views import AppView
from plinth.modules import bind, names
from . import description, get_config, name, port_forwarding_info
from .forms import BindForm
@ -35,8 +36,39 @@ class BindAppView(AppView): # pylint: disable=too-many-ancestors
description = description
show_status_block = True
form_class = BindForm
template_name = 'bind.html'
port_forwarding_info = port_forwarding_info
def get_context_data(self, *args, **kwargs):
"""
Get/append information for domains bind is configured to respond for
and additional names from the names module
"""
context = super().get_context_data(**kwargs)
served_domains = bind.get_served_domains()
context['domains_table'] = []
for key, val in served_domains.items():
if key == 'localhost.':
continue
context['domains_table'].append({
'type': 'Domain Name',
'domain_name': key[:-1:],
'serving': 'Yes',
'ip_address': ', '.join(val),
})
for item in names.components.DomainName.list():
context['domains_table'].append({
'type': item.domain_type.display_name,
'domain_name': item.name,
'serving': '-',
'ip_address': ''
})
return context
def get_initial(self):
"""Return the values to fill in the form."""
initial = super().get_initial()