gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

Add customer to disk space detail view

Browse source
This commit is contained in:
Jan Dittberner 2023-07-22 22:34:09 +02:00
parent 1d4f070867
commit 2e7dca529a
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog.rst
View file

@ -1,6 +1,8 @@
Changelog Changelog
========= =========
* :bug:`-` add customer to disk space detail view
* :release:`0.14.3 <2023-07-22>` * :release:`0.14.3 <2023-07-22>`
* :bug:`-` fix missing permission check on disk space detail view * :bug:`-` fix missing permission check on disk space detail view

2
gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html
View file

@ -44,7 +44,7 @@
You use {{ used_space }} of the reserved disk space of {{ disk_space }} for your hosting package You use {{ used_space }} of the reserved disk space of {{ disk_space }} for your hosting package
{% endblocktranslate %}" class="text-{% if space_level > 90.0 %}danger{% elif space_level > 80.0 %}warning{% else %}success{% endif %}">{% blocktranslate with space_level_percent=space_level|floatformat:1 trimmed%} {% endblocktranslate %}" class="text-{% if space_level > 90.0 %}danger{% elif space_level > 80.0 %}warning{% else %}success{% endif %}">{% blocktranslate with space_level_percent=space_level|floatformat:1 trimmed%}
{{ used_space }} of {{ disk_space }} ({{ space_level_percent }}%) {{ used_space }} of {{ disk_space }} ({{ space_level_percent }}%)
{% endblocktranslate %} <a title="{% translate "Disk usage details" %}" href="{% url "disk_usage_details" package=hostingpackage.id %}">{% translate "Details" %}</a></span> {% endblocktranslate %} <a title="{% translate "Disk usage details" %}" href="{% url "disk_usage_details" user=hostingpackage.customer.username package=hostingpackage.id %}">{% translate "Details" %}</a></span>
<i class="bi-info-circle" <i class="bi-info-circle"
title="{% blocktranslate trimmed %} title="{% blocktranslate trimmed %}
The package contributes {{ package_space }} the difference comes from disk space options The package contributes {{ package_space }} the difference comes from disk space options

2
gnuviechadmin/hostingpackages/urls.py
View file

@ -45,7 +45,7 @@ urlpatterns = [
name="add_hosting_option", name="add_hosting_option",
), ),
path( path(
"<int:package>/disk-usage/", "<str:user>/<int:package>/disk-usage/",
CustomerHostingPackageDiskUsageDetails.as_view(), CustomerHostingPackageDiskUsageDetails.as_view(),
name="disk_usage_details", name="disk_usage_details",
), ),

10
gnuviechadmin/hostingpackages/views.py
View file

@ -327,6 +327,15 @@ class CustomerHostingPackageDiskUsageDetails(StaffOrSelfLoginRequiredMixin, Deta
pk_url_kwarg = "package" pk_url_kwarg = "package"
context_object_name = "hostingpackage" context_object_name = "hostingpackage"
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_queryset(self, queryset=None): def get_queryset(self, queryset=None):
return super().get_queryset().prefetch_related("customerpackagediskusage_set") return super().get_queryset().prefetch_related("customerpackagediskusage_set")
@ -347,6 +356,7 @@ class CustomerHostingPackageDiskUsageDetails(StaffOrSelfLoginRequiredMixin, Deta
context_data.update( context_data.update(
{ {
"customer": self.get_customer_object(),
"disk_usage": disk_usage, "disk_usage": disk_usage,
"mysql_usage": mysql_usage, "mysql_usage": mysql_usage,
"pgsql_usage": pgsql_usage, "pgsql_usage": pgsql_usage,