Merge pull request #1057 from dod-ccpo/seed-sample-perms

Seed sample perms
This commit is contained in:
dandds
2019-09-05 09:44:08 -04:00
committed by GitHub
2 changed files with 5 additions and 8 deletions

View File

@@ -4,7 +4,6 @@ from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.event import listen from sqlalchemy.event import listen
from atst.models import Base, ApplicationRole, types, mixins from atst.models import Base, ApplicationRole, types, mixins
from atst.models.permissions import Permissions
from atst.models.portfolio_invitation import PortfolioInvitation from atst.models.portfolio_invitation import PortfolioInvitation
from atst.models.application_invitation import ApplicationInvitation from atst.models.application_invitation import ApplicationInvitation
from atst.models.mixins.auditable import ( from atst.models.mixins.auditable import (
@@ -97,10 +96,6 @@ class User(
def full_name(self): def full_name(self):
return "{} {}".format(self.first_name, self.last_name) return "{} {}".format(self.first_name, self.last_name)
@property
def has_portfolios(self):
return (Permissions.VIEW_PORTFOLIO in self.permissions) or self.portfolio_roles
@property @property
def displayname(self): def displayname(self):
return self.full_name return self.full_name
@@ -114,8 +109,8 @@ class User(
return None return None
def __repr__(self): def __repr__(self):
return "<User(name='{}', dod_id='{}', email='{}', has_portfolios='{}', id='{}')>".format( return "<User(name='{}', dod_id='{}', email='{}', id='{}')>".format(
self.full_name, self.dod_id, self.email, self.has_portfolios, self.id self.full_name, self.dod_id, self.email, self.id
) )
def to_dictionary(self): def to_dictionary(self):

View File

@@ -156,7 +156,9 @@ def get_users():
def add_members_to_portfolio(portfolio): def add_members_to_portfolio(portfolio):
for user_data in PORTFOLIO_USERS: for user_data in PORTFOLIO_USERS:
invite = Portfolios.invite(portfolio, portfolio.owner, user_data) invite = Portfolios.invite(portfolio, portfolio.owner, user_data)
profile = {k: user_data[k] for k in user_data if k != "dod_id"} profile = {
k: user_data[k] for k in user_data if k not in ["dod_id", "permission_sets"]
}
user = Users.get_or_create_by_dod_id(user_data["dod_id"], **profile) user = Users.get_or_create_by_dod_id(user_data["dod_id"], **profile)
PortfolioRoles.enable(invite.role, user) PortfolioRoles.enable(invite.role, user)