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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/classes/model/AppNotes.php
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"';

41
workflow/engine/classes/model/om/BaseAppNotes.php
View File

@@ -541,7 +541,7 @@ abstract class BaseAppNotes extends BaseObject implements Persistent {
throw $e;
}
}
/**
* Stores the object in the database. If the object is new,
* it inserts it; otherwise an update is performed. This method
@@ -572,7 +572,44 @@ abstract class BaseAppNotes extends BaseObject implements Persistent {
throw $e;
}
}
/**
* @todo This function must be moved to Propel Generator in the correct syntax.
*/
public function createFromArray($aData, $con = null, $sw=true)
{
if ($con === null) {
$con = Propel::getConnection(AppNotesPeer::DATABASE_NAME);
}
if ($sw) $con->begin();
try {
$this->fromArray ( $aData, BasePeer::TYPE_FIELDNAME );
if ($this->validate ()) {
$result = $this->save ($con, $sw);
} else {
if ($sw) $con->rollback ();
$e = new Exception ( "Failed Validation in class " . get_class ( $this ) . "." );
$e->aValidationFailures = $this->getValidationFailures ();
throw ($e);
}
if ($sw) $con->commit ();
return $result;
} catch ( Exception $e ) {
if ($sw) $con->rollback ();
throw ($e);
}
}
/**
* @todo This function must be moved to Propel Generator in the correct syntax.
*/
public function updateFromArray($aData, $con = null, $sw = true)
{
return 0;
}
/**
* Stores the object in the database.
*