diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php index 07573e6ce..3342848a5 100644 --- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php +++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php @@ -318,6 +318,8 @@ $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#'; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;'; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_POST['DYN_UID']; + $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID']; $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view'); diff --git a/workflow/engine/methods/cases/cases_PrintView.php b/workflow/engine/methods/cases/cases_PrintView.php index 7191a16ca..42fc53372 100755 --- a/workflow/engine/methods/cases/cases_PrintView.php +++ b/workflow/engine/methods/cases/cases_PrintView.php @@ -27,10 +27,18 @@ try { require_once 'classes/model/Dynaform.php'; require_once 'classes/model/Process.php'; - + $currentDynUid = ''; + if (isset($_GET['DYNUIDPRINT']) && $_GET['DYNUIDPRINT'] != '') { + $currentDynUid = $_GET['DYNUIDPRINT']; + } elseif (isset($_SESSION['DYN_UID_PRINT'])) { + $currentDynUid = $_SESSION['DYN_UID_PRINT']; + } elseif (isset($_SESSION['CURRENT_DYN_UID'])) { + $currentDynUid = $_SESSION['CURRENT_DYN_UID']; + } $oDynaform = new Dynaform(); - $aDyn = $oDynaform->load($_SESSION['CURRENT_DYN_UID']); + $aDyn = $oDynaform->load($currentDynUid); + G::LoadClass('case'); $oCase = new Cases(); @@ -75,9 +83,7 @@ try { $array['PROCESS'] = G::LoadTranslation('ID_PROCESS'); $array['DATELABEL'] = G::LoadTranslation('DATE_LABEL'); - $aDyn['DYN_UID'] = (isset($_SESSION['DYN_UID_PRINT']) && $_SESSION['DYN_UID_PRINT'] != '') - ? $_SESSION['DYN_UID_PRINT'] - : $aDyn['DYN_UID']; + $aDyn['DYN_UID'] = $currentDynUid; if ($noShowTitle == 0) { $G_PUBLISH->AddContent('smarty', 'cases/cases_PrintViewTitle', '', '', $array); } diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index 9f2a2711e..0f3131263 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -207,6 +207,7 @@ $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE']; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation('ID_NEXT_STEP'); $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PHPSESSID'] = @session_id(); + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_GET['UID']; $oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher->addScriptCode(" diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 288b35378..38795f2ce 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -210,7 +210,7 @@ function pauseCase(date){ xtype:'checkbox', name: 'notifyReason', hideLabel: true, - boxLabel: _('ID_NOTIFY_USERS_CASE'), + boxLabel: _('ID_NOTIFY_USERS_CASE') } ], diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index c186359b4..aac5f69fc 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -493,7 +493,7 @@ Ext.onReady(function(){ xtype:'checkbox', name: 'notifyReason', hideLabel: true, - boxLabel: _('ID_NOTIFY_USERS_CASE'), + boxLabel: _('ID_NOTIFY_USERS_CASE') } ], @@ -688,7 +688,7 @@ Ext.onReady(function(){ id: 'notifyReason', xtype:'checkbox', name: 'notifyReason', - fieldLabel: _('ID_NOTIFY_USERS_CASE'), + fieldLabel: _('ID_NOTIFY_USERS_CASE') } ], buttons : [ diff --git a/workflow/engine/xmlform/gulliver/dynaforms_OptionsPrint.xml b/workflow/engine/xmlform/gulliver/dynaforms_OptionsPrint.xml index e4aeff220..1be364e9c 100755 --- a/workflow/engine/xmlform/gulliver/dynaforms_OptionsPrint.xml +++ b/workflow/engine/xmlform/gulliver/dynaforms_OptionsPrint.xml @@ -6,7 +6,8 @@ - + + Print form