Compare commits
2 commits
1d4f070867
...
f21987158b
Author | SHA1 | Date | |
---|---|---|---|
f21987158b | |||
2e7dca529a |
6 changed files with 17 additions and 4 deletions
|
@ -1,6 +1,9 @@
|
||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
* :release:`0.14.4 <2023-07-22>`
|
||||||
|
* :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
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# import celery_app to initialize it
|
# import celery_app to initialize it
|
||||||
from gnuviechadmin.celery import app as celery_app # NOQA
|
from gnuviechadmin.celery import app as celery_app # NOQA
|
||||||
|
|
||||||
__version__ = "0.14.3"
|
__version__ = "0.14.4"
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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",
|
||||||
),
|
),
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "gva"
|
name = "gva"
|
||||||
version = "0.14.3"
|
version = "0.14.4"
|
||||||
description = "gnuviechadmin web interface"
|
description = "gnuviechadmin web interface"
|
||||||
authors = ["Jan Dittberner <jan@dittberner.info>"]
|
authors = ["Jan Dittberner <jan@dittberner.info>"]
|
||||||
license = "AGPL-3+"
|
license = "AGPL-3+"
|
||||||
|
|
Loading…
Reference in a new issue