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

BUG 5818 Solved

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2011-03-31 17:24:01 -04:00
parent 663479470f
commit 382a9b7ac3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/model/Process.php
View File

@@ -563,13 +563,7 @@ class Process extends BaseProcess {
while( $dt->next() ) { while( $dt->next() ) {
$row = $dt->getRow(); $row = $dt->getRow();
// verify if the title is already set on the current language $processesDetails[$row['CON_ID']] [$row['CON_CATEGORY']] = $row['CON_VALUE'];
if ( ($row['CON_CATEGORY'] == 'PRO_TITLE' || $row['CON_CATEGORY'] == 'PRO_DESCRIPTION') && trim($row['CON_VALUE']) == '') {
// if not, then load the record to generate content for current language
$proData = $this->load($row['CON_ID']);
$row['CON_VALUE'] = $row['CON_CATEGORY'] == 'PRO_TITLE' ? $proData['PRO_TITLE'] : $proData['PRO_DESCRIPTION'];
}
$processesDetails[ $row['CON_ID']] [$row['CON_CATEGORY']] = $row['CON_VALUE'];
} }
G::loadClass('configuration'); G::loadClass('configuration');
@@ -579,6 +573,14 @@ class Process extends BaseProcess {
foreach( $processes as $process ) { foreach( $processes as $process ) {
$proTitle = isset($processesDetails[$process['PRO_UID']]) && isset($processesDetails[$process['PRO_UID']]['PRO_TITLE']) ? $processesDetails[$process['PRO_UID']]['PRO_TITLE'] : ''; $proTitle = isset($processesDetails[$process['PRO_UID']]) && isset($processesDetails[$process['PRO_UID']]['PRO_TITLE']) ? $processesDetails[$process['PRO_UID']]['PRO_TITLE'] : '';
$proDescription = isset($processesDetails[$process['PRO_UID']]) && isset($processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION']) ? $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION']: ''; $proDescription = isset($processesDetails[$process['PRO_UID']]) && isset($processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION']) ? $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION']: '';
// verify if the title is already set on the current language
if ( trim($proTitle) == '') {
// if not, then load the record to generate content for current language
$proData = $this->load($process['PRO_UID']);
$proTitle = $proData['PRO_TITLE'];
$proDescription = $proData['PRO_DESCRIPTION'];
}
//filtering by $processName //filtering by $processName
if( isset($processName) && $processName != '' && stripos($proTitle, $processName) === false){ if( isset($processName) && $processName != '' && stripos($proTitle, $processName) === false){