diff --git a/docs/changelog.rst b/docs/changelog.rst index 7a0523e..b48f199 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,8 @@ Changelog ========= +* :bug:`-` add customer to disk space detail view + * :release:`0.14.3 <2023-07-22>` * :bug:`-` fix missing permission check on disk space detail view diff --git a/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html b/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html index 503a2a2..f610e4d 100644 --- a/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html +++ b/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html @@ -44,7 +44,7 @@ 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%} {{ 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" title="{% blocktranslate trimmed %} The package contributes {{ package_space }} the difference comes from disk space options diff --git a/gnuviechadmin/hostingpackages/urls.py b/gnuviechadmin/hostingpackages/urls.py index 2734ff8..701ed68 100644 --- a/gnuviechadmin/hostingpackages/urls.py +++ b/gnuviechadmin/hostingpackages/urls.py @@ -45,7 +45,7 @@ urlpatterns = [ name="add_hosting_option", ), path( - "<int:package>/disk-usage/", + "<str:user>/<int:package>/disk-usage/", CustomerHostingPackageDiskUsageDetails.as_view(), name="disk_usage_details", ), diff --git a/gnuviechadmin/hostingpackages/views.py b/gnuviechadmin/hostingpackages/views.py index 941e978..86b0b21 100644 --- a/gnuviechadmin/hostingpackages/views.py +++ b/gnuviechadmin/hostingpackages/views.py @@ -327,6 +327,15 @@ class CustomerHostingPackageDiskUsageDetails(StaffOrSelfLoginRequiredMixin, Deta pk_url_kwarg = "package" 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): return super().get_queryset().prefetch_related("customerpackagediskusage_set") @@ -347,6 +356,7 @@ class CustomerHostingPackageDiskUsageDetails(StaffOrSelfLoginRequiredMixin, Deta context_data.update( { + "customer": self.get_customer_object(), "disk_usage": disk_usage, "mysql_usage": mysql_usage, "pgsql_usage": pgsql_usage,