Commit a969a3c9 by Nilu

fix issue of role not being assigned to newly added members

parent ad116a09
...@@ -17,6 +17,7 @@ import oneit.servlets.forms.*; ...@@ -17,6 +17,7 @@ import oneit.servlets.forms.*;
import oneit.servlets.process.*; import oneit.servlets.process.*;
import oneit.utils.*; import oneit.utils.*;
import performa.orm.*; import performa.orm.*;
import performa.orm.types.RoleType;
import performa.utils.Utils; import performa.utils.Utils;
import performa.utils.WebUtils; import performa.utils.WebUtils;
...@@ -102,6 +103,8 @@ public class SendUserInvitationFP extends SaveFP ...@@ -102,6 +103,8 @@ public class SendUserInvitationFP extends SaveFP
link.setCompanyUser(comUser); link.setCompanyUser(comUser);
link.setHiringTeam(hiringTeam); link.setHiringTeam(hiringTeam);
link.setRole(inviteTeammate.getRoleType());
// setting additional hiring teams added when inviting // setting additional hiring teams added when inviting
for (HiringTeamLinkNPO teamLinkNPO : inviteTeammate.getHiringTeamsSet()) for (HiringTeamLinkNPO teamLinkNPO : inviteTeammate.getHiringTeamsSet())
...@@ -110,10 +113,9 @@ public class SendUserInvitationFP extends SaveFP ...@@ -110,10 +113,9 @@ public class SendUserInvitationFP extends SaveFP
teamLink.setCompanyUser(comUser); teamLink.setCompanyUser(comUser);
teamLink.setHiringTeam(teamLinkNPO.getHiringTeam()); teamLink.setHiringTeam(teamLinkNPO.getHiringTeam());
teamLink.setRole(inviteTeammate.getRoleType());
} }
comUser.setRole(inviteTeammate.getRoleType());
LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser); LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser);
sendInvitationMail(comUser, request, objTran); sendInvitationMail(comUser, request, objTran);
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
CompanyUserHiringTeamLink link = CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran); CompanyUserHiringTeamLink link = CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran);
link.setCompanyUser(companyUser); link.setCompanyUser(companyUser);
link.setHiringTeam(hiringTeam); link.setHiringTeam(hiringTeam);
link.setRole(RoleType.OWNER);
} }
secUser = companyUser.getUser(); secUser = companyUser.getUser();
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
CompanyUserHiringTeamLink link = CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran); CompanyUserHiringTeamLink link = CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran);
link.setCompanyUser(companyUser); link.setCompanyUser(companyUser);
link.setHiringTeam(hiringTeam); link.setHiringTeam(hiringTeam);
link.setRole(RoleType.OWNER);
} }
secUser = companyUser.getUser(); secUser = companyUser.getUser();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment