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

Merged in paulis/processmaker/PM-1994 (pull request #1845)

Browse Source 
I solved the issue PM-1994 lists Untitled task
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-02 12:56:02 -04:00
parent 06a3395af4 2b2d23d255
commit ba26e698cf
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/classes/class.case.php
View File

@@ -348,7 +348,14 @@ class Cases
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next(); $rs->next();
$countTaskLabel = 1;
while ($row = $rs->getRow()) { while ($row = $rs->getRow()) {
if($row['TAS_TITLE'] != ''){
$taskTitleLabel = $row['TAS_TITLE'];
} else {
$taskTitleLabel = G::LoadTranslation('ID_UNTITLED_TASK').' '.$countTaskLabel;
$countTaskLabel++;
}
if ($typeView == 'category') { if ($typeView == 'category') {
$taskTitle = TaskPeer::retrieveByPK($row['TAS_UID']); $taskTitle = TaskPeer::retrieveByPK($row['TAS_UID']);
$row['TAS_TITLE'] = $taskTitle->getTasTitle(); $row['TAS_TITLE'] = $taskTitle->getTasTitle();
@@ -356,7 +363,7 @@ class Cases
G::LoadTranslation('ID_PROCESS_NOCATEGORY') : $row['CATEGORY_NAME']; G::LoadTranslation('ID_PROCESS_NOCATEGORY') : $row['CATEGORY_NAME'];
$rows[] = array( $rows[] = array(
'uid' => $row['TAS_UID'], 'uid' => $row['TAS_UID'],
'value' => $row['PRO_TITLE'] . ' (' . $row['TAS_TITLE'] . ')', 'value' => $row['PRO_TITLE'] . ' (' . $taskTitleLabel . ')',
'pro_uid' => $row['PRO_UID'], 'pro_uid' => $row['PRO_UID'],
'cat' => $row['PRO_CATEGORY'], 'cat' => $row['PRO_CATEGORY'],
'catname' => $row['CATEGORY_NAME'] 'catname' => $row['CATEGORY_NAME']
@@ -364,7 +371,7 @@ class Cases
} else { } else {
$rows[] = array( $rows[] = array(
'uid' => $row['TAS_UID'], 'uid' => $row['TAS_UID'],
'value' => $row['PRO_TITLE'] . ' (' . $row['TAS_TITLE'] . ')', 'value' => $row['PRO_TITLE'] . ' (' . $taskTitleLabel . ')',
'pro_uid' => $row['PRO_UID'] 'pro_uid' => $row['PRO_UID']
); );
} }