Fix issue with db.session.commit history and disabling portfolio role

This commit is contained in:
George Drummond 2019-06-07 10:53:34 -04:00
parent cad43af455
commit 5bcfcc1568
No known key found for this signature in database
GPG Key ID: 296DD6077123BF17
2 changed files with 5 additions and 3 deletions

View File

@ -144,11 +144,13 @@ class PortfolioRoles(object):
PortfolioRoles.update(portfolio_role=portfolio_role, set_names=permission_sets) PortfolioRoles.update(portfolio_role=portfolio_role, set_names=permission_sets)
@classmethod @classmethod
def disable(cls, portfolio_role): def disable(cls, portfolio_role, commit=True):
portfolio_role.status = PortfolioRoleStatus.DISABLED portfolio_role.status = PortfolioRoleStatus.DISABLED
db.session.add(portfolio_role) db.session.add(portfolio_role)
db.session.commit()
if commit:
db.session.commit()
return portfolio_role return portfolio_role

View File

@ -43,7 +43,7 @@ class Portfolios(object):
raise PortfolioDeletionApplicationsExistError() raise PortfolioDeletionApplicationsExistError()
for portfolio_role in portfolio.roles: for portfolio_role in portfolio.roles:
PortfolioRoles.disable(portfolio_role) PortfolioRoles.disable(portfolio_role=portfolio_role, commit=False)
portfolio.deleted = True portfolio.deleted = True