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

Cleanup

Browse source
This commit is contained in:
zandercymatics 2024-08-05 12:10:30 -06:00
parent f38cd72d4c
commit 7b8da895db
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/registrar/forms/domain.py
View file

@ -174,21 +174,12 @@ class DomainSuborganizationForm(forms.ModelForm):
self.request = kwargs.pop("request", None) self.request = kwargs.pop("request", None)
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
portfolio = None portfolio = self.instance.portfolio if self.instance else None
if self.instance and self.instance.portfolio:
# Get suborgs under the portfolio that this is associated with first
portfolio = self.instance.portfolio
elif self.request and self.request.user and self.request.user.portfolio:
# Question: If no portfolio is associated with this record,
# should we default to the user one?
# portfolio = self.request.user.portfolio
logger.warning(f"No portfolio was found for {self.instance} on user {self.request.user}.")
self.fields["sub_organization"].queryset = Suborganization.objects.filter(portfolio=portfolio) self.fields["sub_organization"].queryset = Suborganization.objects.filter(portfolio=portfolio)
# Set initial value # Set initial value
if self.instance and self.instance.sub_organization: if self.instance and self.instance.sub_organization:
self.fields['sub_organization'].initial = self.instance.sub_organization self.fields["sub_organization"].initial = self.instance.sub_organization
# Set custom form label # Set custom form label
self.fields["sub_organization"].label = "Suborganization name" self.fields["sub_organization"].label = "Suborganization name"
@ -197,12 +188,12 @@ class DomainSuborganizationForm(forms.ModelForm):
self.fields["sub_organization"].widget.template_name = "django/forms/widgets/combobox.html" self.fields["sub_organization"].widget.template_name = "django/forms/widgets/combobox.html"
# Set data-default-value attribute # Set data-default-value attribute
self.fields['sub_organization'].widget.attrs['data-default-value'] = self.instance.sub_organization.pk if self.instance and self.instance.sub_organization else '' if self.instance and self.instance.sub_organization:
self.fields["sub_organization"].widget.attrs["data-default-value"] = self.instance.sub_organization.pk
def get_suborganization_name(self): def get_suborganization_name(self):
"""Returns the suborganization name for the readonly view""" """Returns the suborganization name for the readonly view"""
return self.instance.sub_organization if self.instance else None return self.instance.sub_organization.name if self.instance else None
class BaseNameserverFormset(forms.BaseFormSet): class BaseNameserverFormset(forms.BaseFormSet):

3
src/registrar/templates/domain_suborganization.html
View file

@ -26,5 +26,4 @@
{% include "includes/input_read_only.html" with field=form.sub_organization value=instance.get_suborganization_name label_description=description%} {% include "includes/input_read_only.html" with field=form.sub_organization value=instance.get_suborganization_name label_description=description%}
{% endwith %} {% endwith %}
{% endif %} {% endif %}
{% endblock %}
{% endblock %}

2
src/registrar/templatetags/custom_filters.py
View file

@ -158,4 +158,4 @@ def and_filter(value, arg):
Implements logical AND operation in templates. Implements logical AND operation in templates.
Usage: {{ value|and:arg }} Usage: {{ value|and:arg }}
""" """
return bool(value and arg) return bool(value and arg)