zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-04 17:01:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/main' into nl/1780-check-SES-before-adding-user

Browse source
This commit is contained in:
CocoByte 2024-05-24 13:13:32 -06:00
commit 1632f4df1f
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
9 changed files with 609 additions and 6063 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/gulpfile.js
View file

@ -33,4 +33,5 @@ exports.init = uswds.init;
exports.compile = uswds.compile;
exports.watch = uswds.watch;
exports.copyAssets = uswds.copyAssets
exports.updateUswds = uswds.updateUswds

6612
src/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
src/package.json
View file

@ -15,7 +15,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@uswds/uswds": "^3.3.0",
"@uswds/uswds": "^3.8.0",
"pa11y-ci": "^3.0.1",
"sass": "^1.54.8"
},

11
src/registrar/admin.py
View file

@ -594,7 +594,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
None,
{"fields": ("username", "password", "status", "verification_type")},
),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
(
"Permissions",
{
@ -625,7 +625,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
)
},
),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
(
"Permissions",
{
@ -651,7 +651,9 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
analyst_readonly_fields = [
"Personal Info",
"first_name",
"middle_name",
"last_name",
"title",
"email",
"Permissions",
"is_active",
@ -1171,7 +1173,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
]
# Readonly fields for analysts and superusers
readonly_fields = ("other_contacts", "generic_org_type", "is_election_board")
readonly_fields = ("other_contacts", "generic_org_type", "is_election_board", "federal_agency")
# Read only that we'll leverage for CISA Analysts
analyst_readonly_fields = [
@ -1438,6 +1440,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"alternative_domains",
"generic_org_type",
"is_election_board",
"federal_agency",
)
# Read only that we'll leverage for CISA Analysts
@ -1879,7 +1882,7 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
search_fields = ["name"]
search_help_text = "Search by domain name."
change_form_template = "django/admin/domain_change_form.html"
readonly_fields = ["state", "expiration_date", "first_ready", "deleted"]
readonly_fields = ("state", "expiration_date", "first_ready", "deleted", "federal_agency")
# Table ordering
ordering = ["name"]

23
src/registrar/migrations/0095_user_middle_name_user_title.py Normal file
View file

@ -0,0 +1,23 @@
# Generated by Django 4.2.10 on 2024-05-22 14:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("registrar", "0094_create_groups_v12"),
]
operations = [
migrations.AddField(
model_name="user",
name="middle_name",
field=models.CharField(blank=True, null=True),
),
migrations.AddField(
model_name="user",
name="title",
field=models.CharField(blank=True, null=True, verbose_name="title / role"),
),
]

11
src/registrar/models/user.py
View file

@ -80,6 +80,17 @@ class User(AbstractUser):
db_index=True,
)
middle_name = models.CharField(
null=True,
blank=True,
)
title = models.CharField(
null=True,
blank=True,
verbose_name="title / role",
)
verification_type = models.CharField(
choices=VerificationTypeChoices.choices,
null=True,

2
src/registrar/templates/base.html
View file

@ -81,7 +81,7 @@
<div class="grid-col-auto">
<img class="usa-banner__header-flag" src="{% static 'img/us_flag_small.png' %}" alt="U.S. flag" />
</div>
<div class="grid-col-fill tablet:grid-col-auto">
<div class="grid-col-fill tablet:grid-col-auto" aria-hidden="true">
<p class="usa-banner__header-text">
An official website of the United States government
</p>

2
src/registrar/templates/includes/footer.html
View file

@ -93,7 +93,7 @@
</li>
<li class="usa-identifier__required-links-item">
<a rel="noopener noreferrer" target="_blank" href="https://www.dhs.gov/accessibility" class="usa-identifier__required-link usa-link usa-link--external"
>Accessibility</a
>Accessibility statement</a
>
</li>
<li class="usa-identifier__required-links-item">

6
src/registrar/tests/test_admin.py
View file

@ -2232,6 +2232,7 @@ class TestDomainRequestAdmin(MockEppLib):
"alternative_domains",
"generic_org_type",
"is_election_board",
"federal_agency",
"id",
"created_at",
"updated_at",
@ -2286,6 +2287,7 @@ class TestDomainRequestAdmin(MockEppLib):
"alternative_domains",
"generic_org_type",
"is_election_board",
"federal_agency",
"creator",
"about_your_organization",
"requested_domain",
@ -2314,6 +2316,7 @@ class TestDomainRequestAdmin(MockEppLib):
"alternative_domains",
"generic_org_type",
"is_election_board",
"federal_agency",
]
self.assertEqual(readonly_fields, expected_fields)
@ -3172,6 +3175,7 @@ class TestDomainInformationAdmin(TestCase):
"other_contacts",
"generic_org_type",
"is_election_board",
"federal_agency",
"creator",
"type_of_work",
"more_organization_information",
@ -3534,7 +3538,7 @@ class TestMyUserAdmin(TestCase):
)
},
),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
("Permissions", {"fields": ("is_active", "groups")}),
("Important dates", {"fields": ("last_login", "date_joined")}),
)