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

Merged in qronald/processmaker/HOR-1316 (pull request #4487)

Browse Source 
Hor 1316
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-08 15:58:21 -04:00
parent 9b34949e5e 01b9f8760f
commit b0e77b2776
13 changed files with 279 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/controllers/dashboard.php
View File

@@ -354,27 +354,14 @@ class Dashboard extends Controller
$criteria = new Criteria( 'workflow' );
$criteria->setDistinct();
$criteria->addSelectColumn( DepartmentPeer::DEP_UID );
$criteria->addSelectColumn( ContentPeer::CON_VALUE );
//FROM
$conditions = array ();
$conditions[] = array (DepartmentPeer::DEP_UID,ContentPeer::CON_ID
);
$conditions[] = array (ContentPeer::CON_CATEGORY,DBAdapter::getStringDelimiter() . 'DEPO_TITLE' . DBAdapter::getStringDelimiter()
);
$conditions[] = array (ContentPeer::CON_LANG,DBAdapter::getStringDelimiter() . 'en' . DBAdapter::getStringDelimiter()
);
$criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
//WHERE
$criteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
$criteria->add( DepartmentPeer::DEP_STATUS, 'ACTIVE' );
//ORDER BY
$criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
$criteria->addAscendingOrderByColumn( DepartmentPeer::DEP_TITLE );
$dataset = DepartmentPeer::doSelectRS( $criteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$dataset->next();
while ($row = $dataset->getRow()) {
$departments[] = array ('OWNER_UID' => $row['DEP_UID'],'OWNER_NAME' => $row['CON_VALUE']
);
$departments[] = array('OWNER_UID' => $row['DEP_UID'], 'OWNER_NAME' => $row['DEP_TITLE']);
$dataset->next();
}