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

HOR-1316 Agregar el campo DEPO_TITLE en la tabla DEPARTMENT

Browse Source
This commit is contained in:
Ronald Q
2016-06-29 11:52:56 -04:00
parent e8caa0ae5d
commit 5c79eb30da
10 changed files with 130 additions and 106 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();
}