diff --git a/src/registrar/migrations/0103_portfolio_domaininformation_portfolio_and_more.py b/src/registrar/migrations/0103_portfolio_domaininformation_portfolio_and_more.py index 15cec0b73..3edc34b2a 100644 --- a/src/registrar/migrations/0103_portfolio_domaininformation_portfolio_and_more.py +++ b/src/registrar/migrations/0103_portfolio_domaininformation_portfolio_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.10 on 2024-06-17 17:08 +# Generated by Django 4.2.10 on 2024-06-17 19:47 from django.conf import settings from django.db import migrations, models @@ -164,7 +164,7 @@ class Migration(migrations.Migration): name="portfolio", field=models.OneToOneField( blank=True, - help_text="Portfolio associated with this domain", + help_text="Portfolio associated with this domain request", null=True, on_delete=django.db.models.deletion.PROTECT, related_name="DomainInformation_portfolio", diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index cffe5f86c..dfb57cee0 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -310,7 +310,7 @@ class DomainRequest(TimeStampedModel): null=True, blank=True, related_name="DomainInformation_portfolio", - help_text="Portfolio associated with this domain", + help_text="Portfolio associated with this domain request", ) # This is the domain request user who created this domain request. The contact diff --git a/src/registrar/models/portfolio.py b/src/registrar/models/portfolio.py index ca5365177..14de445c2 100644 --- a/src/registrar/models/portfolio.py +++ b/src/registrar/models/portfolio.py @@ -21,11 +21,11 @@ class Portfolio(TimeStampedModel): OrganizationChoices = DomainRequest.OrganizationChoices StateTerritoryChoices = DomainRequest.StateTerritoryChoices - # creator- user foreign key- stores who created this model should get the user who is adding - # it via django admin if there is a user (aka not done via commandline/ manual means)""" + # creator - stores who created this model. If no creator is specified in DJA, + # then the creator will default to the current request user""" creator = models.ForeignKey("registrar.User", on_delete=models.PROTECT, help_text="Associated user", unique=False) - # notes- text field (copy what is done on requests/domains) + # notes - text field (copies what is done on domain requests) notes = models.TextField( null=True, blank=True, @@ -41,7 +41,7 @@ class Portfolio(TimeStampedModel): default=get_default_federal_agency, ) - # organization type- should match organization types allowed on domain info + # organization type - should match organization types allowed on domain info organization_type = models.CharField( max_length=255, choices=OrganizationChoices.choices, diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index 62b7bb9d8..802974b6e 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -2291,7 +2291,7 @@ class TestDomainRequestAdmin(MockEppLib): "rejection_reason", "action_needed_reason", "federal_agency", - 'portfolio', + "portfolio", "creator", "investigator", "generic_org_type",