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

Hide password

Browse source
This commit is contained in:
zandercymatics 2024-04-23 10:56:30 -06:00
parent e5b3a6adb4
commit 8d43031d75
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/registrar/admin.py
View file

@ -561,7 +561,7 @@ class MyUserAdmin(BaseUserAdmin):
analyst_fieldsets = ( analyst_fieldsets = (
( (
None, None,
{"fields": ("password", "status")}, {"fields": ("status")},
), ),
("Personal Info", {"fields": ("first_name", "last_name", "email")}), ("Personal Info", {"fields": ("first_name", "last_name", "email")}),
( (
@ -587,7 +587,6 @@ class MyUserAdmin(BaseUserAdmin):
# NOT all fields are readonly for admin, otherwise we would have # NOT all fields are readonly for admin, otherwise we would have
# set this at the permissions level. The exception is 'status' # set this at the permissions level. The exception is 'status'
analyst_readonly_fields = [ analyst_readonly_fields = [
"password",
"Personal Info", "Personal Info",
"first_name", "first_name",
"last_name", "last_name",

9
src/registrar/models/domain.py
View file

@ -278,7 +278,7 @@ class Domain(TimeStampedModel, DomainHelper):
"""Get or set the `ex_date` element from the registry. """Get or set the `ex_date` element from the registry.
Additionally, _get_property updates the expiration date in the registrar""" Additionally, _get_property updates the expiration date in the registrar"""
try: try:
return self._get_property("ex_date") return self._get_property("ex_date", False)
except Exception as e: except Exception as e:
# exception raised during the save to registrar # exception raised during the save to registrar
logger.error(f"error updating expiration date in registrar: {e}") logger.error(f"error updating expiration date in registrar: {e}")
@ -1770,7 +1770,7 @@ class Domain(TimeStampedModel, DomainHelper):
technical_contact = self.get_default_technical_contact() technical_contact = self.get_default_technical_contact()
technical_contact.save() technical_contact.save()
def _fetch_cache(self, fetch_hosts=False, fetch_contacts=False): def _fetch_cache(self, fetch_hosts=False, fetch_contacts=False, fix_unknown=True):
"""Contact registry for info about a domain.""" """Contact registry for info about a domain."""
try: try:
data_response = self._get_or_create_domain() data_response = self._get_or_create_domain()
@ -1778,7 +1778,7 @@ class Domain(TimeStampedModel, DomainHelper):
cleaned = self._clean_cache(cache, data_response) cleaned = self._clean_cache(cache, data_response)
self._update_hosts_and_contacts(cleaned, fetch_hosts, fetch_contacts) self._update_hosts_and_contacts(cleaned, fetch_hosts, fetch_contacts)
if self.state == self.State.UNKNOWN: if self.state == self.State.UNKNOWN and fix_unknown:
self._fix_unknown_state(cleaned) self._fix_unknown_state(cleaned)
if fetch_hosts: if fetch_hosts:
self._update_hosts_and_ips_in_db(cleaned) self._update_hosts_and_ips_in_db(cleaned)
@ -2008,12 +2008,13 @@ class Domain(TimeStampedModel, DomainHelper):
"""Remove cache data when updates are made.""" """Remove cache data when updates are made."""
self._cache = {} self._cache = {}
def _get_property(self, property): def _get_property(self, property, fix_unknown=True):
"""Get some piece of info about a domain.""" """Get some piece of info about a domain."""
if property not in self._cache: if property not in self._cache:
self._fetch_cache( self._fetch_cache(
fetch_hosts=(property == "hosts"), fetch_hosts=(property == "hosts"),
fetch_contacts=(property == "contacts"), fetch_contacts=(property == "contacts"),
fix_unknown=fix_unknown,
) )
if property in self._cache: if property in self._cache: