Commit 35550498 by Nilu

show owner of hiring team. owners cannot be disabled

parent 335bdf18
...@@ -181,9 +181,9 @@ public class CompanyUser extends BaseCompanyUser ...@@ -181,9 +181,9 @@ public class CompanyUser extends BaseCompanyUser
return getRoles() != null && getRoles().contains(role); return getRoles() != null && getRoles().contains(role);
} }
public boolean isOwner() public boolean isOwner(HiringTeam hiringTeam)
{ {
return CollectionUtils.equals(getCompany().getAddedByUser(), this); return CollectionUtils.equals(hiringTeam.getAddedByUser(), this);
} }
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
%> %>
<div class="user-list-row" id="<%= companyUser.getID() %>"> <div class="user-list-row" id="<%= companyUser.getID() %>">
<div class="m-user-left"> <div class="m-user-left">
<oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner() ? 'hide': 'show'" companyUser="<%= companyUser %>"> <oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner(hiringTeam) ? 'hide': 'show'" companyUser="<%= companyUser %>" hiringTeam="<%= hiringTeam %>">
<oneit:button value=" " name="saveCompanyUser" skin="link" <oneit:button value=" " name="saveCompanyUser" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry("remove", Boolean.TRUE) .mapEntry("remove", Boolean.TRUE)
...@@ -158,6 +158,14 @@ ...@@ -158,6 +158,14 @@
<div class="m-user-info"> <div class="m-user-info">
<div class="m-user-name"> <div class="m-user-name">
<oneit:toString value="<%= SecUserToNameTransform.INSTANCE.transform(user) %>" mode="EscapeHTML" /> <oneit:toString value="<%= SecUserToNameTransform.INSTANCE.transform(user) %>" mode="EscapeHTML" />
<%
if(companyUser.isOwner(hiringTeam))
{
%>
<span class="m-user-email">owner</span>
<%
}
%>
</div> </div>
<div class="m-user-email"> <div class="m-user-email">
<oneit:toString value="<%= user.getEmail() %>" mode="EscapeHTML" /> <oneit:toString value="<%= user.getEmail() %>" mode="EscapeHTML" />
...@@ -166,7 +174,7 @@ ...@@ -166,7 +174,7 @@
</div> </div>
<div class="m-user-right-padlock"> <div class="m-user-right-padlock">
<oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner() ? 'hide': 'show'" companyUser="<%= companyUser %>"> <oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner(hiringTeam) ? 'hide': 'show'" companyUser="<%= companyUser %>" hiringTeam="<%= hiringTeam %>">
<div class="arrow_box disble" >DISABLE</div> <div class="arrow_box disble" >DISABLE</div>
<div class="arrow_box enable" >ENABLE</div> <div class="arrow_box enable" >ENABLE</div>
<oneit:button value=" " name="saveCompanyUser" skin="link" <oneit:button value=" " name="saveCompanyUser" skin="link"
......
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