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

workflow/engine/classes/class.wsBase.php

@@ -971,14 +971,17 @@ class wsBase
             }
 
             $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields);
-
             $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
 
             if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
                 if (trim($aSetup["MESS_ACCOUNT"]) != "") {
                     $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
                 } 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") . ">";
+                    }
                 }
             }
 

workflow/engine/templates/app/main.js

@@ -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-name">'+
                         '<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>'+
                       '</td>' +
                     '</tr>' +

workflow/engine/templates/pmTables/edit.js

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