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
This commit is contained in:
parent
2d05580ed3
commit
866f6c8083
16 changed files with 142 additions and 214 deletions
|
@ -15,37 +15,20 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>{% translate "Name" %}</th>
|
||||
<th>{% translate "Disk space" %}</th>
|
||||
<th>{% translate "Mailboxes" %}</th>
|
||||
<th>{% translate "Databases" %}</th>
|
||||
<th>{% translate "Setup date" %}</th>
|
||||
<th>{% translate "Actions" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for package in hosting_packages %}
|
||||
<tr>
|
||||
<th><a href="{{ package.get_absolute_url }}"
|
||||
<td><a href="{{ package.get_absolute_url }}"
|
||||
title="{% blocktranslate with packagename=package.name trimmed %}
|
||||
Show details for {{ packagename }}
|
||||
{% endblocktranslate %}">{{ package.name }}</a>
|
||||
</th>
|
||||
<th>
|
||||
{% 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 %}
|
||||
</th>
|
||||
<th>
|
||||
{% blocktranslate with num=package.used_mailbox_count total=package.mailbox_count trimmed %}
|
||||
used {{ num }} of {{ total }}
|
||||
{% endblocktranslate %}</th>
|
||||
<th>{% 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 %}</th>
|
||||
<th></th>
|
||||
</td>
|
||||
<td>{{ package.created }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
|
|
@ -4,6 +4,7 @@ This module defines the views for the gnuviechadmin customer dashboard.
|
|||
"""
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.shortcuts import redirect
|
||||
from django.views.generic import DetailView, TemplateView
|
||||
from gvacommon.viewmixins import StaffOrSelfLoginRequiredMixin
|
||||
|
||||
|
@ -18,6 +19,11 @@ class IndexView(LoginRequiredMixin, TemplateView):
|
|||
|
||||
template_name = "dashboard/index.html"
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
if not request.user.is_anonymous:
|
||||
return redirect("customer_dashboard", slug=request.user.username)
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
|
||||
|
||||
class UserDashboardView(StaffOrSelfLoginRequiredMixin, DetailView):
|
||||
"""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue