diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 8718da9ba..9201585d7 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -188,11 +188,11 @@ class PortfolioInvitationAdminForm(UserChangeForm): model = models.PortfolioInvitation fields = "__all__" widgets = { - "portfolio_roles": FilteredSelectMultipleArrayWidget( - "portfolio_roles", is_stacked=False, choices=UserPortfolioRoleChoices.choices + "roles": FilteredSelectMultipleArrayWidget( + "roles", is_stacked=False, choices=UserPortfolioRoleChoices.choices ), - "portfolio_additional_permissions": FilteredSelectMultipleArrayWidget( - "portfolio_additional_permissions", + "additional_permissions": FilteredSelectMultipleArrayWidget( + "additional_permissions", is_stacked=False, choices=UserPortfolioPermissionChoices.choices, ), @@ -1387,8 +1387,8 @@ class PortfolioInvitationAdmin(ListHeaderAdmin): list_display = [ "email", "portfolio", - "portfolio_roles", - "portfolio_additional_permissions", + "roles", + "additional_permissions", "status", ] diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py index cdf00c625..51f53340c 100644 --- a/src/registrar/forms/portfolio.py +++ b/src/registrar/forms/portfolio.py @@ -133,14 +133,14 @@ class PortfolioInvitedMemberForm(forms.ModelForm): Form for updating a portfolio invited member. """ - portfolio_roles = forms.MultipleChoiceField( + roles = forms.MultipleChoiceField( choices=UserPortfolioRoleChoices.choices, widget=forms.SelectMultiple(attrs={'class': 'usa-select'}), required=False, label="Roles", ) - portfolio_additional_permissions = forms.MultipleChoiceField( + additional_permissions = forms.MultipleChoiceField( choices=UserPortfolioPermissionChoices.choices, widget=forms.SelectMultiple(attrs={'class': 'usa-select'}), required=False, @@ -150,7 +150,7 @@ class PortfolioInvitedMemberForm(forms.ModelForm): class Meta: model = PortfolioInvitation fields = [ - "portfolio_roles", - "portfolio_additional_permissions", + "roles", + "additional_permissions", ] diff --git a/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py b/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py new file mode 100644 index 000000000..338a20493 --- /dev/null +++ b/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.10 on 2024-10-07 17:12 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("registrar", "0129_alter_portfolioinvitation_portfolio_roles_and_more"), + ] + + operations = [ + migrations.RenameField( + model_name="portfolioinvitation", + old_name="portfolio_additional_permissions", + new_name="additional_permissions", + ), + migrations.RenameField( + model_name="portfolioinvitation", + old_name="portfolio_roles", + new_name="roles", + ), + ] diff --git a/src/registrar/models/portfolio_invitation.py b/src/registrar/models/portfolio_invitation.py index 46d7bf124..392d8264b 100644 --- a/src/registrar/models/portfolio_invitation.py +++ b/src/registrar/models/portfolio_invitation.py @@ -38,7 +38,7 @@ class PortfolioInvitation(TimeStampedModel): related_name="portfolios", ) - portfolio_roles = ArrayField( + roles = ArrayField( models.CharField( max_length=50, choices=UserPortfolioRoleChoices.choices, @@ -48,7 +48,7 @@ class PortfolioInvitation(TimeStampedModel): help_text="Select one or more roles.", ) - portfolio_additional_permissions = ArrayField( + additional_permissions = ArrayField( models.CharField( max_length=50, choices=UserPortfolioPermissionChoices.choices, @@ -88,8 +88,8 @@ class PortfolioInvitation(TimeStampedModel): user_portfolio_permission, _ = UserPortfolioPermission.objects.get_or_create( portfolio=self.portfolio, user=user ) - if self.portfolio_roles and len(self.portfolio_roles) > 0: - user_portfolio_permission.roles = self.portfolio_roles - if self.portfolio_additional_permissions and len(self.portfolio_additional_permissions) > 0: - user_portfolio_permission.additional_permissions = self.portfolio_additional_permissions + if self.roles and len(self.roles) > 0: + user_portfolio_permission.roles = self.roles + if self.additional_permissions and len(self.additional_permissions) > 0: + user_portfolio_permission.additional_permissions = self.additional_permissions user_portfolio_permission.save() diff --git a/src/registrar/templates/includes/member_permissions.html b/src/registrar/templates/includes/member_permissions.html index d2e8d5392..0d38e2073 100644 --- a/src/registrar/templates/includes/member_permissions.html +++ b/src/registrar/templates/includes/member_permissions.html @@ -1,14 +1,8 @@
Admin access
-{% elif permissions.portfolio_roles and 'organization_admin' in permissions.portfolio_roles %} -Admin access
- {% elif permissions.roles and 'organization_member' in permissions.roles %}Basic access
-{% elif permissions.portfolio_roles and 'organization_member' in permissions.portfolio_roles %} -Basic access
- {% else %}⎯
{% endif %} @@ -16,14 +10,8 @@View all requests plus create requests
-{% elif permissions.portfolio_roles and 'organization_admin' in permissions.portfolio_roles or 'edit_requests' in permissions.portfolio_additional_permissions %} -View all requests plus create requests
- {% elif permissions.additional_permissions and 'view_all_requests' in permissions.additional_permissions %}View all requests
-{% elif permissions.portfolio_additional_permissions and 'view_all_requests' in permissions.portfolio_additional_permissions %} -View all requests
- {% else %}No access
{% endif %} @@ -31,14 +19,8 @@View all members plus manage members
-{% elif permissions.portfolio_additional_permissions and 'edit_members' in permissions.portfolio_additional_permissions %} -View all members plus manage members
- {% elif permissions.additional_permissions and 'view_members' in permissions.additional_permissions %}View all members
-{% elif permissions.portfolio_additional_permissions and 'view_members' in permissions.portfolio_additional_permissions %} -View all members
- {% else %}No access
{% endif %} \ No newline at end of file diff --git a/src/registrar/templates/portfolio_member_permissions.html b/src/registrar/templates/portfolio_member_permissions.html index ca7b30b44..02d120360 100644 --- a/src/registrar/templates/portfolio_member_permissions.html +++ b/src/registrar/templates/portfolio_member_permissions.html @@ -27,13 +27,8 @@