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

HOR-1328 Agregar los campos que se guardan en la tabla CONTENT relacionados a la tabla TASK

Browse Source 
pmfunction change content by task

remove lang in pmfunction

add languaje by compatibility
This commit is contained in:
Ronald Q
2016-06-28 10:59:43 -04:00
parent 2eac7c1ac0
commit 8eaeb5e279
17 changed files with 938 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,21 +87,16 @@ class Tasks
{
try {
$aTasks = array();
$sDelimiter = @DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->add(TaskPeer::PRO_UID, $sProUid);
$aConditions = array();
$aConditions[] = array(TaskPeer::TAS_UID, ContentPeer::CON_ID);
$aConditions[] = array(ContentPeer::CON_CATEGORY, $sDelimiter . 'TAS_TITLE' . $sDelimiter);
$aConditions[] = array(ContentPeer::CON_LANG, $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$oCriteria->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
$oDataset = TaskPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$oTask = new Task();
$aTasks[] = $oTask->Load($aRow['TAS_UID']);
$aTasks[] = $oTask->load($aRow['TAS_UID']);
$oDataset->next();
}
return $aTasks;
@@ -703,6 +698,7 @@ class Tasks
try {
$aTasks = array();
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->add(TaskPeer::PRO_UID, $sProUid);
//$oCriteria->add(TaskPeer::TAS_USER, $sUsrUid);
$oCriteria->add(TaskPeer::TAS_START, 'TRUE');
@@ -711,7 +707,7 @@ class Tasks
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$oTask = new Task();
$aTasks[] = $oTask->Load($aRow['TAS_UID']);
$aTasks[] = $oTask->load($aRow['TAS_UID']);
$oDataset->next();
}
return $aTasks;