Skip to content

P
PERFORMA_REPLICA
Commit 4afa27ef by Nilu Committed by Harsh Shah
Options

minor changes

parent 2e414273
Showing with 52 additions and 10 deletions
cmsWebApp/sql/AssessmentCriteriaTemplate.xml
......@@ -8,8 +8,12 @@
<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_created_date" type="Date" nullable="false" length="22"/>
<column name="template_name" type="String" nullable="true" length="100"/>
<column name="template_name" type="String" nullable="false" length="100"/>
<column name="user_id" type="Long" length="11" nullable="true"/>
</NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_assessment_template" indexName="idx_tl_assessment_template_TemplateName" isUnique="true"><column name="template_name"/><column name="user_id"/></NODE>
</NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/CultureCriteriaTemplate.xml
......@@ -12,4 +12,8 @@
<column name="user_id" type="Long" length="11" nullable="true"/>
</NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_culture_template" indexName="idx_tl_culture_template_TemplateName" isUnique="true"><column name="template_name"/><column name="user_id"/></NODE>
</NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/ms/AssessmentCriteriaTemplate.sql
......@@ -8,7 +8,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL
,
template_name varchar(100) NULL,
template_name varchar(100) NOT NULL,
user_id numeric(12) NULL
);
......@@ -22,3 +22,6 @@ ALTER TABLE tl_assessment_template ADD
CREATE UNIQUE INDEX idx_tl_assessment_template_TemplateName ON
tl_assessment_template (template_name, user_id);
\ No newline at end of file
cmsWebApp/sql/ms/CultureCriteriaTemplate.sql
......@@ -22,3 +22,6 @@ ALTER TABLE tl_culture_template ADD
CREATE UNIQUE INDEX idx_tl_culture_template_TemplateName ON
tl_culture_template (template_name, user_id);
\ No newline at end of file
cmsWebApp/sql/oracle/AssessmentCriteriaTemplate.sql
......@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL
,
template_name varchar2(100) NULL,
template_name varchar2(100) NOT NULL,
user_id number(12) NULL
);
......@@ -23,3 +23,6 @@ ALTER TABLE tl_assessment_template ADD
CREATE UNIQUE INDEX idx_tl_assessment_template_TemplateName ON
tl_assessment_template (template_name, user_id);
\ No newline at end of file
cmsWebApp/sql/oracle/CultureCriteriaTemplate.sql
......@@ -23,3 +23,6 @@ ALTER TABLE tl_culture_template ADD
CREATE UNIQUE INDEX idx_tl_culture_template_TemplateName ON
tl_culture_template (template_name, user_id);
\ No newline at end of file
cmsWebApp/sql/postgres/AssessmentCriteriaTemplate.sql
......@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template (
object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL
,
template_name varchar(100) NULL,
template_name varchar(100) NOT NULL,
user_id numeric(12) NULL
);
......@@ -23,3 +23,6 @@ ALTER TABLE tl_assessment_template ADD
CREATE UNIQUE INDEX idx_tl_assessment_template_TemplateName ON
tl_assessment_template (template_name, user_id);
\ No newline at end of file
cmsWebApp/sql/postgres/CultureCriteriaTemplate.sql
......@@ -23,3 +23,6 @@ ALTER TABLE tl_culture_template ADD
CREATE UNIQUE INDEX idx_tl_culture_template_TemplateName ON
tl_culture_template (template_name, user_id);
\ No newline at end of file
cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.xml
......@@ -10,9 +10,9 @@
<TABLE name="tl_assessment_template" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="TemplateName" type="String" dbcol="template_name" length="100"/>
<ATTRIB name="TemplateName" type="String" dbcol="template_name" length="100" mandatory="true" uniqueGroup="TemplateName"/>
<SINGLEREFERENCE name="User" type="SecUser" dbcol="user_id" />
<SINGLEREFERENCE name="User" type="SecUser" dbcol="user_id" uniqueGroup="TemplateName"/>
</TABLE>
......
cmsWebApp/src/performa/orm/BaseAssessmentCriteriaTemplate.java
......@@ -123,6 +123,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
metaInfo.put ("dbcol", "user_id");
metaInfo.put ("name", "User");
metaInfo.put ("type", "SecUser");
metaInfo.put ("uniqueGroup", "TemplateName");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for AssessmentCriteriaTemplate.User:", metaInfo);
ATTRIBUTES_METADATA_AssessmentCriteriaTemplate.put (SINGLEREFERENCE_User, Collections.unmodifiableMap (metaInfo));
......@@ -136,8 +137,10 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
metaInfo.put ("dbcol", "template_name");
metaInfo.put ("length", "100");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "TemplateName");
metaInfo.put ("type", "String");
metaInfo.put ("uniqueGroup", "TemplateName");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for AssessmentCriteriaTemplate.TemplateName:", metaInfo);
ATTRIBUTES_METADATA_AssessmentCriteriaTemplate.put (FIELD_TemplateName, Collections.unmodifiableMap (metaInfo));
......@@ -262,6 +265,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
oldAndNewIdentical = HELPER_TemplateName.compare (_TemplateName, newTemplateName);
}
BusinessObjectParser.assertFieldCondition (newTemplateName != null, this, FIELD_TemplateName, "mandatory");
if (FIELD_TemplateName_Validators.length > 0)
......@@ -1190,7 +1194,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
List result = super.getAttributes ();
result.add(HELPER_TemplateName.getAttribObject (getClass (), _TemplateName, false, FIELD_TemplateName));
result.add(HELPER_TemplateName.getAttribObject (getClass (), _TemplateName, true, FIELD_TemplateName));
return result;
}
......
cmsWebApp/src/performa/orm/BaseCultureCriteriaTemplate.java
......@@ -123,6 +123,7 @@ public abstract class BaseCultureCriteriaTemplate extends BaseBusinessClass
metaInfo.put ("dbcol", "user_id");
metaInfo.put ("name", "User");
metaInfo.put ("type", "SecUser");
metaInfo.put ("uniqueGroup", "TemplateName");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for CultureCriteriaTemplate.User:", metaInfo);
ATTRIBUTES_METADATA_CultureCriteriaTemplate.put (SINGLEREFERENCE_User, Collections.unmodifiableMap (metaInfo));
......@@ -138,6 +139,7 @@ public abstract class BaseCultureCriteriaTemplate extends BaseBusinessClass
metaInfo.put ("length", "100");
metaInfo.put ("name", "TemplateName");
metaInfo.put ("type", "String");
metaInfo.put ("uniqueGroup", "TemplateName");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for CultureCriteriaTemplate.TemplateName:", metaInfo);
ATTRIBUTES_METADATA_CultureCriteriaTemplate.put (FIELD_TemplateName, Collections.unmodifiableMap (metaInfo));
......
cmsWebApp/src/performa/orm/CultureCriteriaTemplate.xml
......@@ -10,9 +10,9 @@
<TABLE name="tl_culture_template" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="TemplateName" type="String" dbcol="template_name" length="100"/>
<ATTRIB name="TemplateName" type="String" dbcol="template_name" length="100" uniqueGroup="TemplateName"/>
<SINGLEREFERENCE name="User" type="SecUser" dbcol="user_id" />
<SINGLEREFERENCE name="User" type="SecUser" dbcol="user_id" uniqueGroup="TemplateName"/>
</TABLE>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
......@@ -9,7 +9,9 @@
<%
boolean toRedirect = GenericObjDF.getOrCreateObject (request, "Job", Job.REFERENCE_Job);
Job job = (Job) process.getAttribute("Job");
Job[] jobs = Job.SearchByAll().search(transaction);
Job[] jobs = Job.SearchByAll()
.andSecUser(new EqualsFilter<>(SecUser.getTXUser(transaction)))
.search(transaction);
Debug.assertion(job != null, "Job is null in admin portal create job");
......
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