Merge branch 'pm_wysiwyg'

workflow/engine/classes/class.xmlfield_InputPM.php

@@ -207,7 +207,7 @@ class XmlForm_Field_TextareaPM extends XmlForm_Field
      * @param eter string owner
      * @return string
      */
-    public function renderGrid ($values = null, $owner)
+    public function renderGrid ($owner, $values = null)
     {
         $result = array ();
         $r = 1;
@@ -320,7 +320,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
      * @param eter string owner
      * @return string
      */
-    public function renderGrid ($values = array(), $owner)
+    public function renderGrid ($values = array(),$owner)
     {
         $result = array ();
         $r = 1;
@@ -380,8 +380,7 @@ function getDynaformsVars ($sProcessUID, $bSystemVars = true, $bIncMulSelFields
     if ($bSystemVars) {
         $aAux = G::getSystemConstants();
         foreach ($aAux as $sName => $sValue) {
-            $aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => 'System variable'
-            );
+            $aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => 'System variable');
         }
         //we're adding the ping variable to the system list
         $aFields[] = array ('sName' => 'PIN','sType' => 'system','sLabel' => 'System variable'

workflow/engine/classes/model/OutputDocument.php

@@ -108,6 +108,7 @@ class OutputDocument extends BaseOutputDocument
             if (!is_null($oOutputDocument)) {
                 $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME);
                 $aFields['OUT_DOC_TITLE']       = $oOutputDocument->getOutDocTitle();
+                $aFields['PRO_UID']             = $oOutputDocument->getProUid();
                 $aFields['OUT_DOC_DESCRIPTION'] = $oOutputDocument->getOutDocDescription();
                 $aFields['OUT_DOC_FILENAME']    = $oOutputDocument->getOutDocFilename();
                 $aFields['OUT_DOC_TEMPLATE']    = $oOutputDocument->getOutDocTemplate();