mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-16 01:27:03 +02:00
Black changes - would not pass otherwise
This commit is contained in:
parent
9ed83a51da
commit
2db74e6b00
4 changed files with 38 additions and 9 deletions
|
@ -4,7 +4,10 @@ from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.http.response import HttpResponseRedirect
|
from django.http.response import HttpResponseRedirect
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from registrar.models.utility.admin_form_order_helper import AdminFormOrderHelper, SortingDict # noqa
|
from registrar.models.utility.admin_form_order_helper import (
|
||||||
|
AdminFormOrderHelper,
|
||||||
|
SortingDict,
|
||||||
|
)
|
||||||
from . import models
|
from . import models
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
|
@ -57,7 +57,7 @@ class AdminFormOrderHelper:
|
||||||
|
|
||||||
# Only order if we choose to do so
|
# Only order if we choose to do so
|
||||||
# noqa for the linter... reduces readability otherwise
|
# noqa for the linter... reduces readability otherwise
|
||||||
if _order_by_list is not None and _order_by_list != []: # noqa
|
if _order_by_list is not None and _order_by_list != []: # noqa
|
||||||
form_field.queryset = form_field.queryset.order_by(*_order_by_list)
|
form_field.queryset = form_field.queryset.order_by(*_order_by_list)
|
||||||
|
|
||||||
return form_field
|
return form_field
|
||||||
|
|
|
@ -10,7 +10,16 @@ from typing import List, Dict
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth import get_user_model, login
|
from django.contrib.auth import get_user_model, login
|
||||||
|
|
||||||
from registrar.models import Contact, DraftDomain, Website, DomainApplication, DomainInvitation, User, DomainInformation, Domain # noqa
|
from registrar.models import (
|
||||||
|
Contact,
|
||||||
|
DraftDomain,
|
||||||
|
Website,
|
||||||
|
DomainApplication,
|
||||||
|
DomainInvitation,
|
||||||
|
User,
|
||||||
|
DomainInformation,
|
||||||
|
Domain,
|
||||||
|
)
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -115,7 +124,7 @@ class AuditedAdminMockData:
|
||||||
as a way to optionally include metadata in the string itself. Can be further expanded on.
|
as a way to optionally include metadata in the string itself. Can be further expanded on.
|
||||||
Came from a bug where different querysets used in testing would effectively be 'anonymized', wherein
|
Came from a bug where different querysets used in testing would effectively be 'anonymized', wherein
|
||||||
it would only display a list of types, but not include the variable name.
|
it would only display a list of types, but not include the variable name.
|
||||||
""" # noqa
|
""" # noqa
|
||||||
|
|
||||||
# Constants for different domain object types
|
# Constants for different domain object types
|
||||||
INFORMATION = "information"
|
INFORMATION = "information"
|
||||||
|
@ -207,7 +216,7 @@ class AuditedAdminMockData:
|
||||||
|
|
||||||
In more detail: domain_type specifies what kind of domain object you'd like to create, i.e.
|
In more detail: domain_type specifies what kind of domain object you'd like to create, i.e.
|
||||||
domain_application (APPLICATION), or domain_information (INFORMATION).
|
domain_application (APPLICATION), or domain_information (INFORMATION).
|
||||||
""" # noqa
|
""" # noqa
|
||||||
common_args = self.get_common_domain_arg_dictionary(
|
common_args = self.get_common_domain_arg_dictionary(
|
||||||
item_name, org_type, federal_type, purpose
|
item_name, org_type, federal_type, purpose
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,9 +1,26 @@
|
||||||
from django.test import TestCase, RequestFactory, Client
|
from django.test import TestCase, RequestFactory, Client
|
||||||
from django.contrib.admin.sites import AdminSite
|
from django.contrib.admin.sites import AdminSite
|
||||||
# noqa is used on all three of these as the linter doesn't like the length of this line
|
|
||||||
from registrar.admin import DomainApplicationAdmin, ListHeaderAdmin, MyUserAdmin, AuditedAdmin # noqa
|
from registrar.admin import (
|
||||||
from registrar.models import DomainApplication, DomainInformation, User, Contact, DomainInvitation # noqa
|
DomainApplicationAdmin,
|
||||||
from .common import completed_application, mock_user, create_superuser, create_user, multiple_unalphabetical_domain_objects # noqa
|
ListHeaderAdmin,
|
||||||
|
MyUserAdmin,
|
||||||
|
AuditedAdmin,
|
||||||
|
)
|
||||||
|
from registrar.models import (
|
||||||
|
DomainApplication,
|
||||||
|
DomainInformation,
|
||||||
|
User,
|
||||||
|
Contact,
|
||||||
|
DomainInvitation,
|
||||||
|
)
|
||||||
|
from .common import (
|
||||||
|
completed_application,
|
||||||
|
mock_user,
|
||||||
|
create_superuser,
|
||||||
|
create_user,
|
||||||
|
multiple_unalphabetical_domain_objects,
|
||||||
|
)
|
||||||
|
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue