zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-19 10:59:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into dk/1989-export-import-tables

Browse source
This commit is contained in:
dave-kennedy-ecs 2024-05-07 07:53:29 -04:00 • committed by GitHub
commit 4039c168fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 1470 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/registrar/admin.py
View file

@ -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
@ -1091,7 +1093,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
(
"Show details",
{
"classes": ["collapse--dotgov"],
"classes": ["collapse--dgfieldset"],
"description": "Extends type of organization",
"fields": [
"federal_type",
@ -1117,7 +1119,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
(
"Show details",
{
"classes": ["collapse--dotgov"],
"classes": ["collapse--dgfieldset"],
"description": "Extends organization name and mailing address",
"fields": [
"address_line1",
@ -1352,7 +1354,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
(
"Show details",
{
"classes": ["collapse--dotgov"],
"classes": ["collapse--dgfieldset"],
"description": "Extends type of organization",
"fields": [
"federal_type",
@ -1378,7 +1380,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
(
"Show details",
{
"classes": ["collapse--dotgov"],
"classes": ["collapse--dgfieldset"],
"description": "Extends organization name and mailing address",
"fields": [
"address_line1",
@ -2252,7 +2254,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
@ -2274,3 +2285,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)