pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove frontend role selection for new member

Browse Source
This commit is contained in:
dandds 2019-03-13 08:33:59 -04:00
parent 0c2ab6fb7a
commit 0eb2d4fa3c
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/portfolios/portfolios.py
View File

@ -105,11 +105,11 @@ class Portfolios(object):
) )
permission_sets = data.get("permission_sets", []) permission_sets = data.get("permission_sets", [])
return Portfolios.add_member( return Portfolios.add_member(
portfolio, new_user, data["portfolio_role"], permission_sets=permission_sets portfolio, new_user, permission_sets=permission_sets
) )
@classmethod @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) portfolio_role = PortfolioRoles.add(member, portfolio.id, permission_sets)
return portfolio_role return portfolio_role

10
atst/forms/new_member.py
View File

@ -7,8 +7,6 @@ from atst.forms.validators import IsNumber
from atst.forms.fields import SelectField from atst.forms.fields import SelectField
from atst.utils.localization import translate from atst.utils.localization import translate
from .data import PORTFOLIO_ROLES
class NewMemberForm(BaseForm): class NewMemberForm(BaseForm):
@ -25,14 +23,6 @@ class NewMemberForm(BaseForm):
translate("forms.new_member.dod_id_label"), translate("forms.new_member.dod_id_label"),
validators=[Required(), Length(min=10), IsNumber()], 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( perms_app_mgmt = SelectField(
None, None,
choices=[ choices=[

1
templates/portfolios/members/new.html
View File

@ -22,7 +22,6 @@
{{ TextInput(form.last_name) }} {{ TextInput(form.last_name) }}
{{ TextInput(form.email,placeholder='jane@mail.mil', validation='email') }} {{ 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') }} {{ TextInput(form.dod_id,placeholder='10-digit number on the back of the CAC', validation='dodId') }}
{{ Selector(form.portfolio_role) }}
<table> <table>
<thead> <thead>
<tr> <tr>

2
tests/domain/test_portfolios.py
View File

@ -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): def test_for_user_does_not_return_inactive_portfolios(portfolio, portfolio_owner):
bob = UserFactory.from_atat_role("default") bob = UserFactory.from_atat_role("default")
Portfolios.add_member(portfolio, bob, "developer") Portfolios.add_member(portfolio, bob)
PortfolioFactory.create() PortfolioFactory.create()
bobs_portfolios = Portfolios.for_user(bob) bobs_portfolios = Portfolios.for_user(bob)

6
tests/routes/portfolios/test_invitations.py
View File

@ -45,10 +45,9 @@ def test_new_member_accepts_valid_invite(monkeypatch, client, user_session):
user_info = UserFactory.dictionary() user_info = UserFactory.dictionary()
user_session(portfolio.owner) user_session(portfolio.owner)
client.post( response = client.post(
url_for("portfolios.create_member", portfolio_id=portfolio.id), url_for("portfolios.create_member", portfolio_id=portfolio.id),
data={ data={
"portfolio_role": "developer",
"perms_app_mgmt": "view_portfolio_application_management", "perms_app_mgmt": "view_portfolio_application_management",
"perms_funding": "view_portfolio_funding", "perms_funding": "view_portfolio_funding",
"perms_reporting": "view_portfolio_reports", "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"]) user = Users.get_by_dod_id(user_info["dod_id"])
token = user.invitations[0].token 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) user_session(portfolio.owner)
response = client.post( response = client.post(
url_for("portfolios.create_member", portfolio_id=portfolio.id), 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 # user tries to view portfolio before accepting invitation