Release 0.14.4

docs/changelog.rst

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* :release:`0.14.4 <2023-07-22>`
+* :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
 

gnuviechadmin/gnuviechadmin/__init__.py

@@ -1,4 +1,4 @@
 # import celery_app to initialize it
 from gnuviechadmin.celery import app as celery_app  # NOQA
 
-__version__ = "0.14.3"
+__version__ = "0.14.4"

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

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",
     ),

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,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gva"
-version = "0.14.3"
+version = "0.14.4"
 description = "gnuviechadmin web interface"
 authors = ["Jan Dittberner <jan@dittberner.info>"]
 license = "AGPL-3+"