diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index b46527e58..b9a624610 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -510,11 +510,13 @@ class Cases $uFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME); //$aFields['TITLE'] = $oApp->getAppTitle(); $aFields['TITLE'] = $aFields['APP_TITLE']; + $aFields['DESCRIPTION'] = $aFields['APP_DESCRIPTION']; $aFields['CREATOR'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); $aFields['CREATE_DATE'] = $oApp->getAppCreateDate(); $aFields['UPDATE_DATE'] = $oApp->getAppUpdateDate(); } catch (Exception $oError) { $aFields['TITLE'] = $oApp->getAppTitle(); + $aFields['DESCRIPTION'] = ''; $aFields['CREATOR'] = '(USER_DELETED)'; $aFields['CREATE_DATE'] = $oApp->getAppCreateDate(); $aFields['UPDATE_DATE'] = $oApp->getAppUpdateDate(); diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index 43b7aa5f8..42f2f3636 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -173,7 +173,6 @@ class AppProxy extends HttpProxyController $taskData = $task->load($applicationFields['TAS_UID']); $currentUser = $applicationFields['CURRENT_USER'] != '' ? $applicationFields['CURRENT_USER'] : '[' . G::LoadTranslation('ID_UNASSIGNED') . ']'; - $data[] = array('label'=>$labels['PRO_TITLE'] , 'value' => $processData['PRO_TITLE'], 'section'=>$labels['TITLE1']); $data[] = array('label'=>$labels['TITLE'] , 'value' => $applicationFields['TITLE'], 'section'=>$labels['TITLE1']); $data[] = array('label'=>$labels['APP_NUMBER'] , 'value' => $applicationFields['APP_NUMBER'], 'section'=>$labels['TITLE1']); @@ -182,6 +181,7 @@ class AppProxy extends HttpProxyController $data[] = array('label'=>$labels['CREATOR'] , 'value' => $applicationFields['CREATOR'], 'section'=>$labels['TITLE1']); $data[] = array('label'=>$labels['CREATE_DATE'] , 'value' => $applicationFields['CREATE_DATE'],'section'=>$labels['TITLE1']); $data[] = array('label'=>$labels['UPDATE_DATE'] , 'value' => $applicationFields['UPDATE_DATE'],'section'=>$labels['TITLE1']); + $data[] = array('label'=>$labels['DESCRIPTION'] , 'value' => $applicationFields['DESCRIPTION'],'section'=>$labels['TITLE1']); // note added by krlos pacha carlos[at]colosa[dot]com //getting this field if it doesn't exist. Related 7994 bug diff --git a/workflow/engine/xmlform/cases/cases_Resume.xml b/workflow/engine/xmlform/cases/cases_Resume.xml index 35833189e..dfa96a2cd 100755 --- a/workflow/engine/xmlform/cases/cases_Resume.xml +++ b/workflow/engine/xmlform/cases/cases_Resume.xml @@ -48,4 +48,7 @@ Finish Date + + Case Description + \ No newline at end of file