Skip to content

P
PERFORMA_REPLICA
Commit a88ceba0 by Nilu
Options

job role changes - standard users to access manage teammates page

parent 96094041
Showing with 70 additions and 10 deletions
cmsWebApp/sql/Client.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="client_name" type="String" nullable="false" length="100"/> <column name="client_name" type="String" nullable="false" length="30"/>
<column name="client_logo" type="BLOB" nullable="true"/> <column name="client_logo" type="BLOB" nullable="true"/>
<column name="email" type="String" nullable="true" length="100"/> <column name="email" type="String" nullable="true" length="100"/>
<column name="contact_name" type="String" nullable="true" length="100"/> <column name="contact_name" type="String" nullable="true" length="100"/>
......
cmsWebApp/sql/ms/Client.sql
...@@ -8,7 +8,7 @@ CREATE TABLE tl_client ( ...@@ -8,7 +8,7 @@ CREATE TABLE tl_client (
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
, ,
client_name varchar(100) NOT NULL, client_name varchar(30) NOT NULL,
client_logo image NULL, client_logo image NULL,
email varchar(100) NULL, email varchar(100) NULL,
contact_name varchar(100) NULL, contact_name varchar(100) NULL,
......
cmsWebApp/sql/oracle/Client.sql
...@@ -9,7 +9,7 @@ CREATE TABLE tl_client ( ...@@ -9,7 +9,7 @@ CREATE TABLE tl_client (
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
, ,
client_name varchar2(100) NOT NULL, client_name varchar2(30) NOT NULL,
client_logo blob NULL, client_logo blob NULL,
email varchar2(100) NULL, email varchar2(100) NULL,
contact_name varchar2(100) NULL, contact_name varchar2(100) NULL,
......
cmsWebApp/sql/postgres/Client.sql
...@@ -9,7 +9,7 @@ CREATE TABLE tl_client ( ...@@ -9,7 +9,7 @@ CREATE TABLE tl_client (
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
, ,
client_name varchar(100) NOT NULL, client_name varchar(30) NOT NULL,
client_logo bytea NULL, client_logo bytea NULL,
email varchar(100) NULL, email varchar(100) NULL,
contact_name varchar(100) NULL, contact_name varchar(100) NULL,
......
cmsWebApp/src/performa/orm/BaseClient.java
...@@ -235,7 +235,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -235,7 +235,7 @@ public abstract class BaseClient extends BaseBusinessClass
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "client_name"); metaInfo.put ("dbcol", "client_name");
metaInfo.put ("length", "100"); metaInfo.put ("length", "30");
metaInfo.put ("mandatory", "true"); metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "ClientName"); metaInfo.put ("name", "ClientName");
metaInfo.put ("type", "String"); metaInfo.put ("type", "String");
......
cmsWebApp/src/performa/orm/Client.xml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<TABLE name="tl_client" tablePrefix="object"> <TABLE name="tl_client" tablePrefix="object">
<ATTRIB name="ClientName" type="String" dbcol="client_name" mandatory="true" length="100"/> <ATTRIB name="ClientName" type="String" dbcol="client_name" mandatory="true" length="30"/>
<ATTRIB name="ClientLogo" type="BinaryContent" dbcol="client_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" /> <ATTRIB name="ClientLogo" type="BinaryContent" dbcol="client_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" />
<ATTRIB name="Email" type="String" dbcol="email" mandatory="false" length="100" validators="Email" /> <ATTRIB name="Email" type="String" dbcol="email" mandatory="false" length="100" validators="Email" />
<ATTRIB name="ContactName" type="String" dbcol="contact_name" mandatory="false" length="100"/> <ATTRIB name="ContactName" type="String" dbcol="contact_name" mandatory="false" length="100"/>
......
cmsWebApp/src/performa/orm/CompanyUserHiringTeamLink.java
...@@ -43,4 +43,33 @@ public class CompanyUserHiringTeamLink extends BaseCompanyUserHiringTeamLink ...@@ -43,4 +43,33 @@ public class CompanyUserHiringTeamLink extends BaseCompanyUserHiringTeamLink
return Arrays.asList(new RoleType[]{RoleType.STANDARD}); return Arrays.asList(new RoleType[]{RoleType.STANDARD});
} }
public boolean showRemoveIcon(CompanyUserHiringTeamLink userLink)
{
RoleType roleType = userLink.getRole();
if(getCompanyUser() == userLink.getCompanyUser() || isOwner())
{
return Boolean.FALSE;
}
if(roleType == RoleType.OWNER || (roleType == RoleType.ADMIN && getRole() == RoleType.STANDARD))
{
return Boolean.TRUE;
}
return Boolean.FALSE;
}
public boolean showEnableIcon(CompanyUserHiringTeamLink userLink)
{
RoleType roleType = userLink.getRole();
if(roleType == RoleType.OWNER || (roleType == RoleType.ADMIN && getRole() == RoleType.STANDARD))
{
return Boolean.TRUE;
}
return Boolean.FALSE;
}
} }
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/manage_users.jsp
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,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="link.isOwner() ? 'hide': 'show'" link="<%= link %>"> <oneit:recalcClass htmlTag="div" classScript="link.showRemoveIcon(comUserLink) ? 'show': 'hide'" link="<%= link %>" comUserLink="<%= comUserLink %>">
<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)
...@@ -159,7 +159,6 @@ ...@@ -159,7 +159,6 @@
<div class="remove-icon">_</div> <div class="remove-icon">_</div>
<div class="arrow_box remove" >REMOVE</div> <div class="arrow_box remove" >REMOVE</div>
</oneit:button> </oneit:button>
</oneit:recalcClass> </oneit:recalcClass>
<div class="m-user-icon"><img src="images/user-list-icon.png"></div> <div class="m-user-icon"><img src="images/user-list-icon.png"></div>
<div class="m-user-info"> <div class="m-user-info">
...@@ -181,7 +180,7 @@ ...@@ -181,7 +180,7 @@
</div> </div>
<div class="m-user-right-padlock"> <div class="m-user-right-padlock">
<oneit:recalcClass htmlTag="div" classScript="link.isOwner() || companyUser == comUser ? 'hide': 'show'" companyUser="<%= companyUser %>" link="<%= link %>" comUser="<%= comUser %>"> <oneit:recalcClass htmlTag="div" classScript="link.showRemoveIcon(comUserLink) ? 'show': 'hide'" link="<%= link %>" comUserLink="<%= comUserLink %>">
<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"
...@@ -304,8 +303,17 @@ ...@@ -304,8 +303,17 @@
%> %>
<div class="user-list-row disabled" id="<%= companyUser.getID() %>"> <div class="user-list-row disabled" id="<%= companyUser.getID() %>">
<div class="m-user-left"> <div class="m-user-left">
<div class="arrow_box remove" >REMOVE</div> <oneit:recalcClass htmlTag="div" classScript="link.showRemoveIcon(comUserLink) ? 'show': 'hide'" link="<%= link %>" comUserLink="<%= comUserLink %>">
<oneit:button value=" " name="saveCompanyUser" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry("remove", Boolean.TRUE)
.mapEntry("CompanyUser", companyUser)
.mapEntry("HiringTeam", hiringTeam)
.toMap() %>">
<div class="remove-icon">_</div> <div class="remove-icon">_</div>
<div class="arrow_box remove" >REMOVE</div>
</oneit:button>
</oneit:recalcClass>
<div class="m-user-icon"><img src="images/user-list-icon.png"></div> <div class="m-user-icon"><img src="images/user-list-icon.png"></div>
<div class="m-user-info"> <div class="m-user-info">
<div class="m-user-name"> <div class="m-user-name">
...@@ -317,6 +325,7 @@ ...@@ -317,6 +325,7 @@
</div> </div>
</div> </div>
<div class="m-user-right-padlock"> <div class="m-user-right-padlock">
<oneit:recalcClass htmlTag="div" classScript="link.showEnableIcon(comUserLink) ? 'show': 'hide'" link="<%= link %>" comUserLink="<%= comUserLink %>">
<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"
...@@ -326,6 +335,7 @@ ...@@ -326,6 +335,7 @@
.toMap() %>"> .toMap() %>">
<span class="m-user-right-padlockicon"><span class="padlock"></span></span> <span class="m-user-right-padlockicon"><span class="padlock"></span></span>
</oneit:button> </oneit:button>
</oneit:recalcClass>
</div> </div>
<div class="m-user-right"> <div class="m-user-right">
<oneit:ormEnum obj="<%= link %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.STANDARD, RoleType.ADMIN, RoleType.OWNER}) %>"/> <oneit:ormEnum obj="<%= link %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.STANDARD, RoleType.ADMIN, RoleType.OWNER}) %>"/>
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20181129_UpdateCMSSecurity.xml 0 → 100644
<?xml version="1.0"?>
<!-- @AutoRun -->
<OBJECTS name="">
<NODE name="Script" factory="Vector">
<NODE name="insertOp" factory="Participant" class="oneit.sql.transfer.InsertOperation"
query="select object_id as roleid from oneit_sec_role where name='TL_CompanyUser'">
<tableName factory="String">oneit_sec_role_priv_link</tableName>
<value name='object_id' factory='Participant' class="oneit.sql.transfer.DBTransferer$ObjectID"/>
<value name='object_last_updated_date' class="oneit.sql.transfer.DBTransferer$Timestamp"/>
<value name='object_created_date' class="oneit.sql.transfer.DBTransferer$Timestamp"/>
<value name='role_id' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="roleid"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20181130_Update_Priv.sql 0 → 100644
UPDATE oneit_sec_role_priv_link SET priv_id = (SELECT object_id FROM oneit_sec_privilege WHERE name='cms:ViewPrivilege:C3QBLBVFH29N1DW078Q67SC93TQ2W6') WHERE priv_id IS NULL;
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