1
0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00

miner changes

This commit is contained in:
Krishna2864 2023-12-02 15:43:50 +05:30
parent be7d4138f4
commit bcbb74d630

View File

@ -1,12 +1,10 @@
from django.contrib import admin from django.contrib import admin
from django.contrib.admin.options import ModelAdmin from django.contrib.admin.options import ModelAdmin
from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models
from django.db.models import F from django.db.models import F
from django.test import RequestFactory, TestCase from django.test import RequestFactory, TestCase
from .models import ( from .models import (
Band, Band,
DynOrderingBandAdmin, DynOrderingBandAdmin,
@ -215,24 +213,23 @@ class TestRelatedFieldsAdminOrdering(TestCase):
class TestCustomAdminOrdering(TestCase): class TestCustomAdminOrdering(TestCase):
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
# Create permissions # Create permissions
perm1 = UserPermission.objects.create(permission='Permission 1') perm1 = UserPermission.objects.create(permission="Permission 1")
perm2 = UserPermission.objects.create(permission='Permission 2') perm2 = UserPermission.objects.create(permission="Permission 2")
perm3 = UserPermission.objects.create(permission='Permission 3') perm3 = UserPermission.objects.create(permission="Permission 3")
# Create users with permissions # Create users with permissions
cls.user1 = SystemUser.objects.create(name='User 1') cls.user1 = SystemUser.objects.create(name="User 1")
cls.user2 = SystemUser.objects.create(name='User 2') cls.user2 = SystemUser.objects.create(name="User 2")
cls.user1.permissions.add(perm1, perm2) cls.user1.permissions.add(perm1, perm2)
cls.user2.permissions.add(perm1, perm2, perm3) cls.user2.permissions.add(perm1, perm2, perm3)
# Register Admin classes # Register Admin classes
class UserAdmin(admin.ModelAdmin): class UserAdmin(admin.ModelAdmin):
ordering = ['-permissions__count'] ordering = ["-permissions__count"]
def get_queryset(self, request): def get_queryset(self, request):
qs = super().get_queryset(request) qs = super().get_queryset(request)
@ -249,5 +246,5 @@ class TestCustomAdminOrdering(TestCase):
fk_field = admin.site._registry[ReportData].formfield_for_foreignkey( fk_field = admin.site._registry[ReportData].formfield_for_foreignkey(
ReportData.owner.field, request=None ReportData.owner.field, request=None
) )
expected_order = [self.user2, self.user1] # Ordering by permissions count expected_order = [self.user2, self.user1] # Ordering by permissions
self.assertEqual(list(fk_field.queryset), expected_order) self.assertEqual(list(fk_field.queryset), expected_order)