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

merge conflict

Browse source
This commit is contained in:
asaki222 2024-11-14 16:12:57 -05:00
parent 08b9de2dce
commit 199c38c32f
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/registrar/migrations/0138_merge_20241114_2101.py Normal file
View file

@ -0,0 +1,13 @@
# Generated by Django 4.2.10 on 2024-11-14 21:01
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("registrar", "0137_alter_domaininvitation_status"),
("registrar", "0137_suborganization_city_suborganization_state_territory"),
]
operations = []

2
src/registrar/views/domain.py
View file

@ -2,7 +2,7 @@
Authorization is handled by the `DomainPermissionView`. To ensure that only
authorized users can see information on a domain, every view here should
inherit from `DomainPermissionView` (or DomainInvitationPermissionDeleteView).
inherit from `DomainPermissionView`.
"""
from datetime import date

1
src/registrar/views/utility/__init__.py
View file

@ -5,7 +5,6 @@ from .permission_views import (
DomainPermissionView,
DomainRequestPermissionView,
DomainRequestPermissionWithdrawView,
DomainInvitationPermissionDeleteView,
DomainRequestWizardPermissionView,
PortfolioMembersPermission,
DomainRequestPortfolioViewonlyView,