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

Merged in 3.1 (pull request #4709)

Browse Source 
Updating branch HOR-1500 with changes in 3.1 (2016-08-09)
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-09 11:07:46 -04:00
parent 08c72686be 62b958f812
commit f8f40736b8
10 changed files with 1495 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/model/ListPaused.php
View File

@@ -26,12 +26,14 @@ class ListPaused extends BaseListPaused {
{
$criteria = new Criteria();
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['APP_TITLE'];
if (!isset($data['APP_TITLE'])) {
$data['APP_TITLE'] = $aRow['APP_TITLE'];
}
$criteria = new Criteria();
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);

1
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -103,7 +103,6 @@ class ListUnassigned extends BaseListUnassigned
$criteria = new Criteria();
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
$criteria->addSelectColumn( ApplicationPeer::APP_TITLE );
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);