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

Merge branch 'master' of git://github.com/colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2013-08-21 10:51:25 -04:00
parent e65e0fe9b7 5dbf3f76fe
commit a11b8f2da6
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.wsBase.php
View File

@@ -971,14 +971,17 @@ class wsBase
} }
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields); $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields);
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match ); $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) { if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
if (trim($aSetup["MESS_ACCOUNT"]) != "") { if (trim($aSetup["MESS_ACCOUNT"]) != "") {
$sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">"; $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
} else { } else {
$sFrom = "<info@" . $_SERVER["HTTP_HOST"] . ">"; if ($aSetup["MESS_ENGINE"] == "MAIL") {
$sFrom = "\"" . stripslashes($sFrom) . "\"";
} else {
$sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
}
} }
} }

2
workflow/engine/templates/app/main.js
View File

@@ -106,7 +106,7 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid)
'<td class="x-cnotes-label"><img border="0" src="../users/users_ViewPhotoGrid?pUID={USR_UID}" width="40" height="40"/></td>' + '<td class="x-cnotes-label"><img border="0" src="../users/users_ViewPhotoGrid?pUID={USR_UID}" width="40" height="40"/></td>' +
'<td class="x-cnotes-name">'+ '<td class="x-cnotes-name">'+
'<p class="user-from">{user}</p>'+ '<p class="user-from">{user}</p>'+
'<p style="width: 260px; overflow-x:auto;", class="x-editable x-message">{NOTE_CONTENT}</p> '+ '<p style="width: 260px; overflow-x:auto; height: 40px;", class="x-editable x-message">{NOTE_CONTENT}</p> '+
'<p class="x-editable"><small>'+_('ID_POSTED_AT')+'<i> {NOTE_DATE}</i></small></p>'+ '<p class="x-editable"><small>'+_('ID_POSTED_AT')+'<i> {NOTE_DATE}</i></small></p>'+
'</td>' + '</td>' +
'</tr>' + '</tr>' +

12
workflow/engine/templates/pmTables/edit.js
View File

@@ -145,22 +145,26 @@ Ext.onReady(function(){
{ {
id: 'uid', id: 'uid',
dataIndex: 'uid', dataIndex: 'uid',
hidden: true hidden: true,
hideable:false
}, },
{ {
id: 'field_uid', id: 'field_uid',
dataIndex: 'field_uid', dataIndex: 'field_uid',
hidden: true hidden: true,
hideable:false
}, },
{ {
id: 'field_key', id: 'field_key',
dataIndex: 'field_key', dataIndex: 'field_key',
hidden: true hidden: true,
hideable:false
}, },
{ {
id: 'field_null', id: 'field_null',
dataIndex: 'field_null', dataIndex: 'field_null',
hidden: true hidden: true,
hideable:false
}, },
{ {
id: 'field_dyn', id: 'field_dyn',