S13004655 # Client - Incoming Issues (raised by Client) #Only Owner can create new HT

cmsWebApp/src/performa/orm/CompanyUser.java

@@ -182,9 +182,9 @@ public class CompanyUser extends BaseCompanyUser
         return getRoles() != null && getRoles().contains(role);
     }
     
-    public boolean isOwner(HiringTeam hiringTeam)
+    public boolean isOwner()
     {
-        return CollectionUtils.equals(hiringTeam.getAddedByUser(), this);
+        return pipelineCompanyUser().toHiringTeams().toRole().uniqueVals().contains(RoleType.OWNER);
     }
     
     

cmsWebApp/src/performa/orm/CompanyUserHiringTeamLink.java

 package performa.orm;
 
-import java.util.Arrays;
-import java.util.List;
 import oneit.objstore.FieldWriteability;
 import performa.orm.types.RoleType;
 

cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp

@@ -15,7 +15,8 @@
     CompanyUser             comUser         =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
     UserSortOption          userSortOpt     =   (UserSortOption) process.getAttribute("UserSortOption");
     Collection<CompanyUser> companyUsers    =   (Collection<CompanyUser>) process.getAttribute("CompanyUsers");
-    
+    boolean                 readOnly        =   !comUser.isOwner();
+
     if(company == null)
     {
         company =   comUser.getCompany();
@@ -118,19 +119,19 @@
                     </div>
                     <div class="form-group">
                         <label><oneit:label GUIName="Hiring Team Name" /></label>
-                        <oneit:ormInput obj="<%= company %>"    type="text" attributeName="HiringTeamName"   cssClass="form-control"    />
+                        <oneit:ormInput obj="<%= company %>"    type="text" attributeName="HiringTeamName"   cssClass="form-control"    readonly="<%= readOnly%>"/>
                     </div>
                     <div class="form-group">
                         <label><oneit:label GUIName="Team Owner/Admin" /></label>
                         <div class="wider-select">
-                            <tagfile:ormsingleasso_select obj="<%= company %>"  assocName="Owner"  options="<%= companyUsers.toArray(new CompanyUser[0]) %>"/>
+                            <tagfile:ormsingleasso_select obj="<%= company %>"  assocName="Owner"  options="<%= !readOnly ? companyUsers.toArray(new CompanyUser[0]) : new CompanyUser[0] %>" />
                         </div> 
                     </div>
                     <div class="form-group">
                         <label><oneit:label GUIName="Billing" /></label>
                         <div class="styled_checkboxes">
                             <div class="checkbox checkbox-primary">
-                                <oneit:ormInput obj="<%= company %>"  id="manage-own-billing"  attributeName="ManageOwnBilling" type="checkbox"/>
+                                <oneit:ormInput obj="<%= company %>"  id="manage-own-billing"  attributeName="ManageOwnBilling" type="checkbox" readonly="<%= readOnly%>"/>
                                 <oneit:recalcClass  htmlTag="span"  classScript="company.showTeamManagesOwnBilling() ? 'checked': 'unchecked'"    company="<%= company %>">
                                     <label for="manage-own-billing">
                                         <oneit:ormlabel  obj="<%= company %>"    field="ManageOwnBilling" />
@@ -143,15 +144,18 @@
                         <oneit:recalcClass  htmlTag="div"  classScript="company.showTeamManagesOwnBilling() ? 'hide': 'show'"    company="<%= company %>">
                             <label><oneit:label GUIName="Select Billing Team" /></label>
                             <div class="wider-select">
-                                <tagfile:ormsingleasso_select obj="<%= company %>"  assocName="BillingTeam" options="<%= company.getHiringTeamsSet().toArray(new HiringTeam[0]) %>"/>
+                                <tagfile:ormsingleasso_select obj="<%= company %>"  assocName="BillingTeam" options="<%= !readOnly ? company.getHiringTeamsSet().toArray(new HiringTeam[0]) : new HiringTeam[0] %>"/>
                             </div> 
                         </oneit:recalcClass>
                     </div>
-                    <oneit:button   value="Add Team"  name="addHiringTeam"  cssClass="btn btn-invite"   
-                                    requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
-                                                                    .mapEntry ("restartProcess", Boolean.TRUE)
-                                                                    .mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
-                                                                    .toMap() %>" />
+                    
+                    <oneit:recalcClass  htmlTag="div"   classScript="readOnly ? 'hide': 'show'"  readOnly="<%= readOnly%>">
+                        <oneit:button   value="Add Team"  name="addHiringTeam"  cssClass="btn btn-invite"   
+                                        requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
+                                                                        .mapEntry ("restartProcess", Boolean.TRUE)
+                                                                        .mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
+                                                                        .toMap() %>" />
+                    </oneit:recalcClass>
                 </div>
             </div>
         </div>

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

@@ -160,7 +160,7 @@
         @page
         {
             size: 1340px 1896px;;
-           margin : 0;
+            margin : 0;
             @top-left { content: element(header);}
             
         }