mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-19 02:49:21 +02:00
Merge remote-tracking branch 'origin' into es/1793-link-federal-agency-table
This commit is contained in:
commit
dfda5b37d4
42 changed files with 1601 additions and 164 deletions
|
@ -15,6 +15,8 @@ from django.contrib.contenttypes.models import ContentType
|
|||
from django.urls import reverse
|
||||
from dateutil.relativedelta import relativedelta # type: ignore
|
||||
from epplibwrapper.errors import ErrorCode, RegistryError
|
||||
from waffle.admin import FlagAdmin
|
||||
from waffle.models import Sample, Switch
|
||||
from registrar.models import Contact, Domain, DomainRequest, DraftDomain, User, Website
|
||||
from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
|
||||
from registrar.views.utility.mixins import OrderableFieldsMixin
|
||||
|
@ -1013,7 +1015,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
|
|||
(
|
||||
"Show details",
|
||||
{
|
||||
"classes": ["collapse--dotgov"],
|
||||
"classes": ["collapse--dgfieldset"],
|
||||
"description": "Extends type of organization",
|
||||
"fields": [
|
||||
"federal_type",
|
||||
|
@ -1037,7 +1039,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
|
|||
(
|
||||
"Show details",
|
||||
{
|
||||
"classes": ["collapse--dotgov"],
|
||||
"classes": ["collapse--dgfieldset"],
|
||||
"description": "Extends organization name and mailing address",
|
||||
"fields": [
|
||||
"address_line1",
|
||||
|
@ -1264,7 +1266,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
|
|||
(
|
||||
"Show details",
|
||||
{
|
||||
"classes": ["collapse--dotgov"],
|
||||
"classes": ["collapse--dgfieldset"],
|
||||
"description": "Extends type of organization",
|
||||
"fields": [
|
||||
"federal_type",
|
||||
|
@ -1288,7 +1290,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
|
|||
(
|
||||
"Show details",
|
||||
{
|
||||
"classes": ["collapse--dotgov"],
|
||||
"classes": ["collapse--dgfieldset"],
|
||||
"description": "Extends organization name and mailing address",
|
||||
"fields": [
|
||||
"address_line1",
|
||||
|
@ -2154,7 +2156,16 @@ class UserGroupAdmin(AuditedAdmin):
|
|||
return obj.name
|
||||
|
||||
|
||||
class WaffleFlagAdmin(FlagAdmin):
|
||||
class Meta:
|
||||
"""Contains meta information about this class"""
|
||||
|
||||
model = models.WaffleFlag
|
||||
fields = "__all__"
|
||||
|
||||
|
||||
admin.site.unregister(LogEntry) # Unregister the default registration
|
||||
|
||||
admin.site.register(LogEntry, CustomLogEntryAdmin)
|
||||
admin.site.register(models.User, MyUserAdmin)
|
||||
# Unregister the built-in Group model
|
||||
|
@ -2176,3 +2187,10 @@ admin.site.register(models.PublicContact, PublicContactAdmin)
|
|||
admin.site.register(models.DomainRequest, DomainRequestAdmin)
|
||||
admin.site.register(models.TransitionDomain, TransitionDomainAdmin)
|
||||
admin.site.register(models.VerifiedByStaff, VerifiedByStaffAdmin)
|
||||
|
||||
# Register our custom waffle implementations
|
||||
admin.site.register(models.WaffleFlag, WaffleFlagAdmin)
|
||||
|
||||
# Unregister Sample and Switch from the waffle library
|
||||
admin.site.unregister(Sample)
|
||||
admin.site.unregister(Switch)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue