Remove duplicate functionality

- remove customer hosting package list
- replace useless dashboard with redirect
- move all hosting package list for superuser to top level menu item
- replace btn-default with btn-secondary
- improve email address management page

gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html

@@ -11,6 +11,9 @@
                 <th>{% translate "Name" %}</th>
                 <th>{% translate "Customer" %}</th>
                 <th>{% translate "OS User" %}</th>
+                <th>{% translate "Disk space" %}</th>
+                <th>{% translate "Mailboxes" %}</th>
+                <th>{% translate "Databases" %}</th>
                 <th>{% translate "Setup date" %}</th>
             </tr>
             </thead>
@@ -21,6 +24,22 @@
                     <td>
                         <a href="{% url 'customer_dashboard' slug=package.customer.username %}">{{ package.customer }}</a>
                     </td>
+                    <td>
+                        {% with diskspace=package.get_disk_space %}
+                            <span title="{% blocktranslate trimmed %}
+                                            The reserved disk space for your hosting package is {{ diskspace }} bytes.
+{% endblocktranslate %}">{{ diskspace|filesizeformat }}</span>
+                        {% endwith %}
+                    </td>
+                    <td>
+                        {% blocktranslate with num=package.used_mailbox_count total=package.mailbox_count trimmed %}
+                            used {{ num }} of {{ total }}
+                        {% endblocktranslate %}</td>
+                    <td>{% for dbtype in package.get_databases %}
+                        {{ dbtype.number }}
+                        {% include "userdbs/snippets/db_type.html" with db_type=dbtype.db_type %}
+                        {% if not forloop.last %} / {% endif %}
+                    {% endfor %}</td>
                     <td>{{ package.osuser.username }}</td>
                     <td>{{ package.created }}</td>
                 </tr>

gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_list.html

@@ -1,48 +0,0 @@
-{% extends "hostingpackages/base.html" %}
-{% load i18n %}
-{% block title %}{{ block.super }} - {% spaceless %}
-    {% if user == customer %}
-        {% translate "Your hosting packages" %}
-    {% else %}
-        {% blocktranslate with customer=customer.get_full_name trimmed %}Hosting Packages of
-            {{ customer }}{% endblocktranslate %}
-    {% endif %}
-{% endspaceless %}{% endblock title %}
-
-{% block page_title %}{% spaceless %}
-    {% if user == customer %}
-        {% translate "Your hosting packages" %}
-    {% else %}
-        {% blocktranslate with customer=customer.get_full_name trimmed %}Hosting Packages
-            <small>of {{ customer }}</small>{% endblocktranslate %}
-    {% endif %}
-{% endspaceless %}{% endblock page_title %}
-
-{% block content %}
-    {% if customerhostingpackage_list %}
-        <table class="table table-condensed">
-            <thead>
-            <tr>
-                <th>{% translate "Name" %}</th>
-                <th>{% translate "Setup date" %}</th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for package in customerhostingpackage_list %}
-                <tr>
-                    <td><a href="{{ package.get_absolute_url }}">{{ package.name }}</a></td>
-                    <td>{{ package.created }}</td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p class="text-info">
-            {% if user == customer %}{% translate "You have no hosting packages setup yet." %}{% else %}
-                {% translate "There are no hosting packages setup for this customer yet." %}{% endif %}</p>
-    {% endif %}
-    {% if user.is_staff %}
-        <p><a href="{% url 'create_customer_hosting_package' user=customer.username %}"
-              class="btn btn-primary">{% translate "Add hosting package" %}</a></p>
-    {% endif %}
-{% endblock content %}

gnuviechadmin/hostingpackages/urls.py

@@ -12,7 +12,6 @@ from .views import (
     CreateCustomerHostingPackage,
     CreateHostingPackage,
     CustomerHostingPackageDetails,
-    CustomerHostingPackageList,
     HostingOptionChoices,
 )
 
@@ -23,11 +22,6 @@ urlpatterns = [
         AllCustomerHostingPackageList.as_view(),
         name="all_hosting_packages",
     ),
-    re_path(
-        r"^(?P<user>[-\w0-9@.+_]+)/$",
-        CustomerHostingPackageList.as_view(),
-        name="hosting_packages",
-    ),
     re_path(
         r"^(?P<user>[-\w0-9@.+_]+)/create$",
         CreateCustomerHostingPackage.as_view(),

gnuviechadmin/hostingpackages/views.py

@@ -149,35 +149,6 @@ class AllCustomerHostingPackageList(StaffUserRequiredMixin, ListView):
         )
 
 
-class CustomerHostingPackageList(StaffOrSelfLoginRequiredMixin, ListView):
-    """
-    This view is used for showing a list of a customer's hosting packages.
-
-    """
-
-    model = CustomerHostingPackage
-    customer = None
-
-    def get_customer_object(self):
-        if self.customer is None:
-            self.customer = get_object_or_404(
-                get_user_model(), username=self.kwargs["user"]
-            )
-        return self.customer
-
-    def get_context_data(self, **kwargs):
-        context = super(CustomerHostingPackageList, self).get_context_data(**kwargs)
-        context["customer"] = self.get_customer_object()
-        return context
-
-    def get_queryset(self):
-        return (
-            super(CustomerHostingPackageList, self)
-            .get_queryset()
-            .filter(customer__username=self.kwargs["user"])
-        )
-
-
 class HostingOptionChoices(StaffUserRequiredMixin, DetailView):
     """
     This view displays choices of hosting options for a customer hosting