diff --git a/atst/routes/portfolios/index.py b/atst/routes/portfolios/index.py index b4c15a70..01490d62 100644 --- a/atst/routes/portfolios/index.py +++ b/atst/routes/portfolios/index.py @@ -63,11 +63,20 @@ def serialize_member_form_data(member): } +def get_members_data(portfolio): + members = [serialize_member_form_data(member) for member in portfolio.members] + for member in members: + if member["user_id"] == portfolio.owner.id: + ppoc = member + members.remove(member) + members.insert(0, ppoc) + return members + + def render_admin_page(portfolio, form=None): pagination_opts = Paginator.get_pagination_opts(http_request) audit_events = AuditLog.get_portfolio_events(portfolio, pagination_opts) - members_data = [serialize_member_form_data(member) for member in portfolio.members] - + members_data = get_members_data(portfolio) portfolio_form = PortfolioForm(data={"name": portfolio.name}) member_perms_form = member_forms.MembersPermissionsForm( data={"members_permissions": members_data} diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index de9f3f92..1b2e2692 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -272,6 +272,7 @@ .members-table-ppoc { select::-ms-expand { display: none; + color: $color-gray; } select { @@ -288,11 +289,12 @@ word-break: normal; padding-right: 3rem; padding-left: 1.2rem; + color: $color-gray; } select:hover { box-shadow: none; - color: $color-base; + color: $color-gray; } } diff --git a/templates/fragments/admin/members_edit.html b/templates/fragments/admin/members_edit.html index 8f5f8fd2..13811667 100644 --- a/templates/fragments/admin/members_edit.html +++ b/templates/fragments/admin/members_edit.html @@ -3,17 +3,20 @@ {% for subform in member_perms_form.members_permissions %} {% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, subform.user_id.data) %} {% set ppoc = subform.user_id.data == portfolio.owner.id %} + {% set archive_button_class = 'button-danger-outline' %}