diff --git a/workflow/engine/js/cases/core/cases_Step.js b/workflow/engine/js/cases/core/cases_Step.js index d0e22c629..839857bed 100644 --- a/workflow/engine/js/cases/core/cases_Step.js +++ b/workflow/engine/js/cases/core/cases_Step.js @@ -709,31 +709,29 @@ var showDynaforms = function() { { oPanel2 = new leimnud.module.panel(); oPanel2.options = { - size :{w:600,h:400}, + size :{w:800,h:600}, position:{x:0,y:0,center:true}, title :'', theme :'processmaker', - statusBar:true, - control :{resize:true,roll:false}, + statusBar:false, + control :{resize:false,roll:false}, fx :{modal:true,opacity:true,blinkToFront:true,fadeIn:false} }; oPanel2.events = { remove: function() {delete(oPanel2);}.extend(this) }; oPanel2.make(); - oPanel2.loader.show(); - var oRPC = new leimnud.module.rpc.xmlhttp({ - url : 'cases_Ajax', - args: 'action=showDynaform&DYN_UID='+DYN_UID - }); - oRPC.callback = function(rpc){ - oPanel2.loader.hide(); - var scs=rpc.xmlhttp.responseText.extractScript(); - oPanel2.addContent(rpc.xmlhttp.responseText); - scs.evalScript();scs.evalScript(); - }.extend(this); - oRPC.make(); + + var iframe=document.createElement('iframe'); + iframe.setAttribute('id','dynaFormIframe'); + iframe.src = 'cases_Ajax?action=showDynaform&DYN_UID='+DYN_UID; + iframe.style.border='0px'; + iframe.style.width='790'; + iframe.style.height=_client.height-20; + oPanel2.addContent(iframe); + } + function showDynaformHistory(DYN_UID,HISTORY_ID) { oPanel2 = new leimnud.module.panel(); diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index ac5fda906..21f03fb5e 100644 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -49,7 +49,8 @@ if(isset($_POST['showWindow'])) { if(! isset($_POST['action'])) { $_POST['action'] = ''; } -switch($_POST['action']) { + +switch(($_POST['action'])?$_POST['action']:$_REQUEST['action']) { case 'steps': global $G_PUBLISH; $G_PUBLISH = new Publisher(); @@ -546,9 +547,9 @@ switch($_POST['action']) { $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#'; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;'; $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID']; - if(!isset($_SESSION['CURRENT_DYN_UID'])) $_SESSION['CURRENT_DYN_UID'] = $_POST['DYN_UID']; - $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view'); - G::RenderPage('publish', 'raw'); + if(!isset($_SESSION['CURRENT_DYN_UID'])) $_SESSION['CURRENT_DYN_UID'] = $_POST['DYN_UID']?$_POST['DYN_UID']:$_REQUEST['DYN_UID']; + $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_REQUEST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view'); + G::RenderPage('publish', 'blank'); break; case 'showDynaformHistory': $G_PUBLISH = new Publisher();