fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 11835: assignment rules after upgrade to 2.0.46

Browse Source 
Sol: changing SELF_SERVICE to SELF_SERVICE_EVALUATE in case the new option has been selected. schema.xml got a new validation value.
This commit is contained in:
ralpheav
2013-06-03 16:43:48 -04:00
parent f11e5cc6e8
commit 1cf8146baf
4 changed files with 15 additions and 15 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'] : ""; $aFields['TAS_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
} }
if ($iForm == 2) { //if ($iForm == 2) {
switch ($aFields["TAS_ASSIGN_TYPE"]) { // switch ($aFields["TAS_ASSIGN_TYPE"]) {
case "SELF_SERVICE": // case "SELF_SERVICE":
$aFields["TAS_ASSIGN_TYPE"] = (!empty($aFields["TAS_GROUP_VARIABLE"])) ? "SELF_SERVICE_EVALUATE" : $aFields["TAS_ASSIGN_TYPE"]; // $aFields["TAS_ASSIGN_TYPE"] = (!empty($aFields["TAS_GROUP_VARIABLE"])) ? "SELF_SERVICE_EVALUATE" : $aFields["TAS_ASSIGN_TYPE"];
break; // break;
} // }
} //}
global $G_PUBLISH; global $G_PUBLISH;
G::LoadClass('xmlfield_InputPM'); 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::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN); $c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE'); $c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE'); $c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE_EVALUATE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '', Criteria::NOT_EQUAL); $c->add(TaskPeer::TAS_GROUP_VARIABLE, '', Criteria::NOT_EQUAL);
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);

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

@@ -1243,7 +1243,7 @@
<rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ALERT."/> <rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ALERT."/>
</validator> </validator>
<validator column="TAS_ASSIGN_TYPE"> <validator column="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."/> <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."/>
</validator> </validator>
<validator column="TAS_ASSIGN_LOCATION"> <validator column="TAS_ASSIGN_LOCATION">
<rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ASSIGN_LOCATION."/> <rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ASSIGN_LOCATION."/>

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

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