This commit is contained in:
CocoByte 2024-06-19 23:00:01 -06:00
parent df719f2108
commit 7c2c9a1f27
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
2 changed files with 13 additions and 38 deletions

View file

@ -1319,7 +1319,6 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
change_form_template = "django/admin/domain_information_change_form.html"
superuser_only_fields = [
"portfolio",
]
@ -1340,9 +1339,9 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
if not request.user.has_perm("registrar.full_access_permission"):
modified_fieldsets = []
for name, data in fieldsets:
fields = data.get('fields', [])
fields = data.get("fields", [])
fields = tuple(field for field in fields if field not in self.superuser_only_fields)
modified_fieldsets.append((name, {'fields': fields}))
modified_fieldsets.append((name, {"fields": fields}))
return modified_fieldsets
return fieldsets
@ -1640,33 +1639,12 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
if not request.user.has_perm("registrar.full_access_permission"):
modified_fieldsets = []
for name, data in fieldsets:
fields = data.get('fields', [])
fields = data.get("fields", [])
fields = tuple(field for field in fields if field not in self.superuser_only_fields)
modified_fieldsets.append((name, {'fields': fields}))
modified_fieldsets.append((name, {"fields": fields}))
return modified_fieldsets
return fieldsets
# Fields only superusers can view
# exclude = ['address_line1', ]
# widgets = {'portfolio': forms.HiddenInput()}
# def get_form(self, request, obj, **kwargs):
# if request.user.has_perm("registrar.full_access_permission"):
# self.exclude = self.superuser_only_fields
# # self.fieldsets[1][1]['fields'][0].append('portfolio')
# # self.fieldsets[1][1]['fields'].pop('status')
# form = super(DomainRequestAdmin, self).get_form(request, obj, **kwargs)
# return form
# if not request.user.has_perm("registrar.full_access_permission"):
# for fieldset in self.fieldsets:
# for field in fieldset[0]["fields"]:
# if field==
# Table ordering
# NOTE: This impacts the select2 dropdowns (combobox)
# Currentl, there's only one for requests on DomainInfo
@ -1925,7 +1903,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
return super().change_view(request, object_id, form_url, extra_context)
def process_log_entry(self, log_entry):
"""Process a log entry and return filtered entry dictionary if applicable."""
changes = log_entry.changes
status_changed = "status" in changes
@ -1983,7 +1960,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
return None
class TransitionDomainAdmin(ListHeaderAdmin):
"""Custom transition domain admin class."""
@ -2638,7 +2614,6 @@ class PortfolioAdmin(ListHeaderAdmin):
# "requestor",
# ]
def save_model(self, request, obj, form, change):
if obj.creator is not None: