pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Set order_by on DatabaseListView queryset

This commit is contained in:
Santiago L 2024-01-30 13:47:22 +01:00
parent 156ab51f33
commit ee9416d8ed
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchestra/contrib/musician/urls.py
View File

@ -37,6 +37,6 @@ urlpatterns = [
path('mailboxes/<int:pk>/delete/', views.MailboxDeleteView.as_view(), name='mailbox-delete'), path('mailboxes/<int:pk>/delete/', views.MailboxDeleteView.as_view(), name='mailbox-delete'),
path('mailboxes/<int:pk>/change-password/', views.MailboxChangePasswordView.as_view(), name='mailbox-password'), path('mailboxes/<int:pk>/change-password/', views.MailboxChangePasswordView.as_view(), name='mailbox-password'),
path('mailing-lists/', views.MailingListsView.as_view(), name='mailing-lists'), path('mailing-lists/', views.MailingListsView.as_view(), name='mailing-lists'),
path('databases/', views.DatabasesView.as_view(), name='database-list'), path('databases/', views.DatabaseListView.as_view(), name='database-list'),
path('saas/', views.SaasListView.as_view(), name='saas-list'), path('saas/', views.SaasListView.as_view(), name='saas-list'),
] ]

10
orchestra/contrib/musician/views.py
View File

@ -3,6 +3,7 @@ import smtplib
from typing import Any from typing import Any
from django.conf import settings from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.core.mail import mail_managers from django.core.mail import mail_managers
from django.db.models import Value from django.db.models import Value
@ -29,6 +30,7 @@ from orchestra.contrib.databases.models import Database
from orchestra.contrib.domains.models import Domain, Record from orchestra.contrib.domains.models import Domain, Record
from orchestra.contrib.lists.models import List from orchestra.contrib.lists.models import List
from orchestra.contrib.mailboxes.models import Address, Mailbox from orchestra.contrib.mailboxes.models import Address, Mailbox
from orchestra.contrib.resources.models import Resource, ResourceData
from orchestra.contrib.saas.models import SaaS from orchestra.contrib.saas.models import SaaS
from orchestra.utils.html import html_to_pdf from orchestra.utils.html import html_to_pdf
@ -453,7 +455,7 @@ class MailboxChangePasswordView(CustomContextMixin, UserTokenRequiredMixin, Upda
return self.model.objects.filter(account=self.request.user) return self.model.objects.filter(account=self.request.user)
class DatabasesView(ServiceListView): class DatabaseListView(ServiceListView):
template_name = "musician/database_list.html" template_name = "musician/database_list.html"
model = Database model = Database
service_class = DatabaseService service_class = DatabaseService
@ -463,11 +465,9 @@ class DatabasesView(ServiceListView):
} }
def get_queryset(self): def get_queryset(self):
qs = super().get_queryset() qs = super().get_queryset().order_by("name")
# TODO(@slamora): optimize query
from django.contrib.contenttypes.models import ContentType
from orchestra.contrib.resources.models import Resource, ResourceData # TODO(@slamora): optimize query
ctype = ContentType.objects.get_for_model(self.model) ctype = ContentType.objects.get_for_model(self.model)
disk_resource = Resource.objects.get(name='disk', content_type=ctype) disk_resource = Resource.objects.get(name='disk', content_type=ctype)
for db in qs: for db in qs: