fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 11835 : ./workflow/engine/config/schema.xml

Browse Source 
SOl: Set the default TAS_GROUP_VARIABLE to "" and set TAS_GROUP_VARIABLE to @@SYS_GROUP_TO_BE_ASSIGNED in php code
This commit is contained in:
ralpheav
2013-06-03 17:47:58 -04:00
parent 1cf8146baf
commit f43952006e
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/class.processMap.php
View File

@@ -1515,13 +1515,13 @@ class processMap
$aFields['TAS_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
}
//if ($iForm == 2) {
// switch ($aFields["TAS_ASSIGN_TYPE"]) {
// case "SELF_SERVICE":
// $aFields["TAS_ASSIGN_TYPE"] = (!empty($aFields["TAS_GROUP_VARIABLE"])) ? "SELF_SERVICE_EVALUATE" : $aFields["TAS_ASSIGN_TYPE"];
// break;
// }
//}
if ($iForm == 2) {
switch ($aFields["TAS_ASSIGN_TYPE"]) {
case "SELF_SERVICE":
$aFields["TAS_ASSIGN_TYPE"] = (!empty($aFields["TAS_GROUP_VARIABLE"])) ? "SELF_SERVICE_EVALUATE" : $aFields["TAS_ASSIGN_TYPE"];
break;
}
}
global $G_PUBLISH;
G::LoadClass('xmlfield_InputPM');

2
workflow/engine/classes/model/AppCacheView.php
View File

@@ -343,7 +343,7 @@ class AppCacheView extends BaseAppCacheView
$c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE_EVALUATE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '', Criteria::NOT_EQUAL);
$rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);

4
workflow/engine/config/schema.xml
View File

@@ -1198,7 +1198,7 @@
<column name="TAS_PRIORITY_VARIABLE" type="VARCHAR" size="100" required="true" default=""/>
<column name="TAS_ASSIGN_TYPE" type="VARCHAR" size="30" required="true" default="BALANCED"/>
<column name="TAS_ASSIGN_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_NEXT_USER_TO_BE_ASSIGNED"/>
<column name="TAS_GROUP_VARIABLE" type="VARCHAR" size="100" required="false" default="@@SYS_GROUP_TO_BE_ASSIGNED"/>
<column name="TAS_GROUP_VARIABLE" type="VARCHAR" size="100" required="false"/>
<column name="TAS_MI_INSTANCE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCE"/>
<column name="TAS_MI_COMPLETE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCES_COMPLETE"/>
<column name="TAS_ASSIGN_LOCATION" type="VARCHAR" size="20" required="true" default="FALSE"/>
@@ -1243,7 +1243,7 @@
<rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ALERT."/>
</validator>
<validator column="TAS_ASSIGN_TYPE">
<rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|SELF_SERVICE_EVALUATE|STATIC_MI|CANCEL_MI" message="Please select a valid value for TAS_ASSIGN_TYPE."/>
<rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|STATIC_MI|CANCEL_MI" message="Please select a valid value for TAS_ASSIGN_TYPE."/>
</validator>
<validator column="TAS_ASSIGN_LOCATION">
<rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ASSIGN_LOCATION."/>

15
workflow/engine/methods/tasks/tasks_Ajax.php
View File

@@ -64,12 +64,15 @@ try {
}
//Validating TAS_ASSIGN_VARIABLE value
//if (!isset($aData['TAS_ASSIGN_TYPE'])) {
// $aData['TAS_ASSIGN_TYPE'] = 'BALANCED';
//}
if ($aData['TAS_ASSIGN_TYPE'] != 'SELF_SERVICE_EVALUATE') {
// $aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
//} else {
if (!isset($aData['TAS_ASSIGN_TYPE'])) {
$aData['TAS_ASSIGN_TYPE'] = 'BALANCED';
}
if ($aData['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE_EVALUATE') {
$aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
if(trim($aData['TAS_GROUP_VARIABLE']) == '') {
$aData['TAS_GROUP_VARIABLE'] = '@@SYS_GROUP_TO_BE_ASSIGNED';
}
} else {
$aData['TAS_GROUP_VARIABLE'] = '';
}