S12516860 # Client - Incoming Issues (raised by Client) #Phone number required but no message

cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java

@@ -68,6 +68,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
         {
             BusinessObjectParser.assertFieldCondition(companyUser.isTrue(companyUser.getPrivacyPolicyAgreed()), companyUser, CompanyUser.FIELD_PrivacyPolicyAgreed, "agreePrivacy", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(companyUser.isTrue(companyUser.getConditionsAgreed()), companyUser, CompanyUser.FIELD_ConditionsAgreed, "agreeTerms", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(companyUser.getPhone() != null , companyUser, CompanyUser.FIELD_Phone, "mandatory", exceptions, true, request);
         }
         
         super.validate(process, submission, exceptions, params);

cmsWebApp/src/performa/form/SendVerificationMailFP.java

@@ -45,6 +45,7 @@ public class SendVerificationMailFP extends SaveFP
             BusinessObjectParser.assertFieldCondition(!Utils.emailExists(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(companyUser.isTrue(companyUser.getPrivacyPolicyAgreed()), companyUser, CompanyUser.FIELD_PrivacyPolicyAgreed, "agreePrivacy", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(companyUser.isTrue(companyUser.getConditionsAgreed()), companyUser, CompanyUser.FIELD_ConditionsAgreed, "agreeTerms", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(companyUser.getPhone() != null , companyUser, CompanyUser.FIELD_Phone, "mandatory", exceptions, true, request);
         }
         else
         {

cmsWebApp/src/performa/orm/CompanyUser.java

@@ -213,6 +213,7 @@ public class CompanyUser extends BaseCompanyUser
     
     public RoleType getRoleForHiringTeam(HiringTeam hiringTeam)
     {
-        return hiringTeam.pipelineHiringTeam().toUsers(CompanyUserHiringTeamLink.SearchByAll().andCompanyUser(new EqualsFilter<>(this))).val().getRole();
+        CompanyUserHiringTeamLink link = hiringTeam.pipelineHiringTeam().toUsers(CompanyUserHiringTeamLink.SearchByAll().andCompanyUser(new EqualsFilter<>(this))).val();
+        return link != null ? link.getRole() : null;
     }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/HiringTeam.java

@@ -184,7 +184,7 @@ public class HiringTeam extends BaseHiringTeam
         {
             CompanyUser companyUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
             
-            if(companyUser.getRoleForHiringTeam(this) == RoleType.STANDARD)
+            if(companyUser != null && companyUser.getRoleForHiringTeam(this) == RoleType.STANDARD)
             {
                 return FieldWriteability.NOT_IN_GUI;
             }

cmsWebApp/webroot/extensions/adminportal/inc/company_user_data.jsp

@@ -49,7 +49,7 @@
     </div>
     <div class="form-group text-left">
         <label><oneit:ormlabel  obj="<%= companyUser %>"    field="Phone" /></label>
-        <oneit:ormInput obj="<%= companyUser %>"    type="text" attributeName="Phone"       cssClass="form-control" required="true"/>
+        <oneit:ormInput obj="<%= companyUser %>"    type="text" attributeName="Phone"       cssClass="form-control"/>
     </div>
     <div class="form-group text-left">
         <label>Hiring Team</label>