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

Merge branch '2.0' of git.colosa.net:processmaker into 2.0

Browse Source
This commit is contained in:
fernando
2011-03-21 19:15:29 -04:00
parent 9b68a75fc1 3aea681889
commit 44683e73a0
5 changed files with 12 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -564,9 +564,10 @@ class Process extends BaseProcess {
while( $dt->next() ) {
$row = $dt->getRow();
// verify if the title is already set on the current language
if ( $row['CON_CATEGORY'] == 'PRO_TITLE' && trim($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
$row = $this->load($row['CON_ID']);
$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'];
}