etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 13742: check only for Pending invitations while inviting the same account to the project again 

status 13742: resolved fixed
Reviewed-by: Frank
This commit is contained in:
Alena Prokharchyk 2012-02-15 10:34:48 -08:00
parent e86425b717
commit 3d9790c319
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/src/com/cloud/projects/ProjectManagerImpl.java
View File

@ -444,10 +444,27 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
return _projectAccountDao.persist(new ProjectAccountVO(project, accountId, accountRole));
}
@Override
@Override @DB
public boolean deleteAccountFromProject(long projectId, long accountId) {
boolean success = true;
Transaction txn = Transaction.currentTxn();
txn.start();
//remove account
ProjectAccountVO projectAccount = _projectAccountDao.findByProjectIdAccountId(projectId, accountId);
return _projectAccountDao.remove(projectAccount.getId());
success = _projectAccountDao.remove(projectAccount.getId());
//remove all invitations for account
if (success) {
s_logger.debug("Removed account " + accountId + " from project " + projectId + " , cleaning up old invitations for account/project...");
ProjectInvitation invite = _projectInvitationDao.findByAccountIdProjectId(accountId, projectId);
if (invite != null) {
success = success && _projectInvitationDao.remove(invite.getId());
}
}
txn.commit();
return success;
}
@Override
@ -730,7 +747,8 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
}
if (invite != null) {
if (invite.getState() == ProjectInvitation.State.Completed || _projectInvitationDao.isActive(invite.getId(), _invitationTimeOut)) {
if (invite.getState() == ProjectInvitation.State.Completed ||
(invite.getState() == ProjectInvitation.State.Pending && _projectInvitationDao.isActive(invite.getId(), _invitationTimeOut))) {
return true;
} else {
if (invite.getState() == ProjectInvitation.State.Pending) {