BUG 0000 Case notes Index added and some changes to message body

Index for AppNotes table

Conflicts:

	workflow/engine/classes/model/AppNotes.php
This commit is contained in:
Hugo Loza
2011-07-26 16:53:54 -04:00
parent eb680847da
commit f38dc1045f
5 changed files with 74 additions and 10 deletions

View File

@@ -149,14 +149,15 @@ class AppNotes extends BaseAppNotes {
return false;
}
$oUser = new Users();
$aUser = $oUser->load($usrUid);
$authorName = ((($aUser['USR_FIRSTNAME'] != '') || ($aUser['USR_LASTNAME'] != '')) ? $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' ' : '') . '<' . $aUser['USR_EMAIL'] . '>';
G::LoadClass('case');
$oCase = new Cases ();
$aFields = $oCase->loadCase( $appUid );
$configNoteNotification['subject']=G::LoadTranslation('ID_MESSAGE_SUBJECT_NOTE_NOTIFICATION')." @@APP_TITLE ";
$configNoteNotification['body']=G::LoadTranslation('ID_CASE').": @@APP_TITLE<br />".G::LoadTranslation('ID_AUTHOR').": @@USR_USRNAME<br /><br />$noteContent";
$aFields = $oCase->loadCase( $appUid );
$configNoteNotification['subject']= G::LoadTranslation('ID_MESSAGE_SUBJECT_NOTE_NOTIFICATION')." @#APP_TITLE ";
$configNoteNotification['body'] = G::LoadTranslation('ID_CASE') . ": @$APP_TITLE<br />" . G::LoadTranslation('ID_AUTHOR').": $authorName<br /><br />$noteContent";
if ($sFrom == '') {
$sFrom = '"ProcessMaker"';