diff --git a/atst/domain/portfolios/portfolios.py b/atst/domain/portfolios/portfolios.py index 0741856c..748b386f 100644 --- a/atst/domain/portfolios/portfolios.py +++ b/atst/domain/portfolios/portfolios.py @@ -105,11 +105,11 @@ class Portfolios(object): ) permission_sets = data.get("permission_sets", []) return Portfolios.add_member( - portfolio, new_user, data["portfolio_role"], permission_sets=permission_sets + portfolio, new_user, permission_sets=permission_sets ) @classmethod - def add_member(cls, portfolio, member, role_name, permission_sets=None): + def add_member(cls, portfolio, member, permission_sets=None): portfolio_role = PortfolioRoles.add(member, portfolio.id, permission_sets) return portfolio_role diff --git a/atst/forms/new_member.py b/atst/forms/new_member.py index 88d6ec21..8c683dc7 100644 --- a/atst/forms/new_member.py +++ b/atst/forms/new_member.py @@ -7,8 +7,6 @@ from atst.forms.validators import IsNumber from atst.forms.fields import SelectField from atst.utils.localization import translate -from .data import PORTFOLIO_ROLES - class NewMemberForm(BaseForm): @@ -25,14 +23,6 @@ class NewMemberForm(BaseForm): translate("forms.new_member.dod_id_label"), validators=[Required(), Length(min=10), IsNumber()], ) - portfolio_role = SelectField( - translate("forms.new_member.portfolio_role_label"), - choices=PORTFOLIO_ROLES, - validators=[Required()], - default="", - description=translate("forms.new_member.portfolio_role_description"), - ) - perms_app_mgmt = SelectField( None, choices=[ diff --git a/templates/portfolios/members/new.html b/templates/portfolios/members/new.html index 58f8cf67..190a3716 100644 --- a/templates/portfolios/members/new.html +++ b/templates/portfolios/members/new.html @@ -22,7 +22,6 @@ {{ TextInput(form.last_name) }} {{ TextInput(form.email,placeholder='jane@mail.mil', validation='email') }} {{ TextInput(form.dod_id,placeholder='10-digit number on the back of the CAC', validation='dodId') }} - {{ Selector(form.portfolio_role) }} diff --git a/tests/domain/test_portfolios.py b/tests/domain/test_portfolios.py index 1d117875..34b926ea 100644 --- a/tests/domain/test_portfolios.py +++ b/tests/domain/test_portfolios.py @@ -243,7 +243,7 @@ def test_for_user_returns_active_portfolios_for_user(portfolio, portfolio_owner) def test_for_user_does_not_return_inactive_portfolios(portfolio, portfolio_owner): bob = UserFactory.from_atat_role("default") - Portfolios.add_member(portfolio, bob, "developer") + Portfolios.add_member(portfolio, bob) PortfolioFactory.create() bobs_portfolios = Portfolios.for_user(bob) diff --git a/tests/routes/portfolios/test_invitations.py b/tests/routes/portfolios/test_invitations.py index a4d89144..e6ea7a95 100644 --- a/tests/routes/portfolios/test_invitations.py +++ b/tests/routes/portfolios/test_invitations.py @@ -45,10 +45,9 @@ def test_new_member_accepts_valid_invite(monkeypatch, client, user_session): user_info = UserFactory.dictionary() user_session(portfolio.owner) - client.post( + response = client.post( url_for("portfolios.create_member", portfolio_id=portfolio.id), data={ - "portfolio_role": "developer", "perms_app_mgmt": "view_portfolio_application_management", "perms_funding": "view_portfolio_funding", "perms_reporting": "view_portfolio_reports", @@ -57,6 +56,7 @@ def test_new_member_accepts_valid_invite(monkeypatch, client, user_session): }, ) + assert response.status_code == 302 user = Users.get_by_dod_id(user_info["dod_id"]) token = user.invitations[0].token @@ -101,7 +101,7 @@ def test_user_who_has_not_accepted_portfolio_invite_cannot_view(client, user_ses user_session(portfolio.owner) response = client.post( url_for("portfolios.create_member", portfolio_id=portfolio.id), - data={"portfolio_role": "developer", **user.to_dictionary()}, + data=user.to_dictionary(), ) # user tries to view portfolio before accepting invitation