diff --git a/gulliver/js/ext/min/ext-all.js b/gulliver/js/ext/min/ext-all.js index ca099948b..7912bff9f 100644 --- a/gulliver/js/ext/min/ext-all.js +++ b/gulliver/js/ext/min/ext-all.js @@ -6,11 +6,11 @@ PMExtJSCommon=function(){this.version='1.8';this.notify_time_out=3;this.confirm= setTimeout(fnYes,0) else if(fnNo!=undefined) setTimeout(fnNo,0)});} -this.info=function(title,msg,fn){Ext.MessageBox.show({title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.INFO});} -this.question=function(title,msg,fn){Ext.MessageBox.show({title:title,msg:msg,buttons:Ext.MessageBox.YESNO,animEl:'mb9',fn:function(btn,text){if(btn=='yes') +this.info=function(title,msg,fn){Ext.MessageBox.show({id:'infoMessageBox',title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.INFO});} +this.question=function(title,msg,fn){Ext.MessageBox.show({id:'questionMessageBox',title:title,msg:msg,buttons:Ext.MessageBox.YESNO,animEl:'mb9',fn:function(btn,text){if(btn=='yes') setTimeout(fn,0);},icon:Ext.MessageBox.QUESTION});} -this.warning=function(title,msg,fn){Ext.MessageBox.show({title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.WARNING});} -this.error=function(title,msg,fn){Ext.MessageBox.show({title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.ERROR});} +this.warning=function(title,msg,fn){Ext.MessageBox.show({id:'warningMessageBox',title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.WARNING});} +this.error=function(title,msg,fn){Ext.MessageBox.show({id:'errorMessageBox',title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.ERROR});} this.notify=function(title,msg,type,time) {Ext.msgBoxSlider.msg(title,msg,type,time);} this.getBrowser=function() diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php index 4a41d8837..fb50838d4 100755 --- a/workflow/engine/classes/class.dynaformEditor.php +++ b/workflow/engine/classes/class.dynaformEditor.php @@ -236,7 +236,7 @@ class dynaformEditor extends WebResource var DYNAFORM_URL="' . $Parameters['URL'] . '"; leimnud.event.add(window,"load",function(){ loadEditor(); }); '); - $oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLogged__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";'); + $oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLoggedDE__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";'); $oHeadPublisher->addScriptCode('var dynaformEditorParams = \'' . serialize($Parameters) . '\';'); G::RenderPage("publish", 'blank'); } diff --git a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js index fa3b5287d..e83e882cf 100644 --- a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js +++ b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js @@ -28,7 +28,7 @@ var verifyLogin = function() { } var rpc = new leimnud.module.rpc.xmlhttp({ url : '../login/authentication', - args: 'form[USR_USERNAME]=' + __usernameLogged__ + '&form[USR_PASSWORD]=' + document.getElementById('thePassword').value.trim() + '&form[USR_LANG]=' + SYS_LANG + args: 'form[USR_USERNAME]=' + __usernameLoggedDE__ + '&form[USR_PASSWORD]=' + document.getElementById('thePassword').value.trim() + '&form[USR_LANG]=' + SYS_LANG }); rpc.callback = function(rpc) { if (rpc.xmlhttp.responseText.indexOf('form[USR_USERNAME]') == -1) { @@ -565,7 +565,7 @@ var dynaformEditor={ // lineNumbers: true, // lineWrapping: true }); //} - + } } else { showRowById('JS_TITLE'); @@ -774,7 +774,7 @@ var dynaformEditor={ } } this.currentJS=field.value; - + var res=this.ajax.get_javascripts(this.A,field.value); if(field.value == ''){ if( typeof(res.aOptions[0]) !== "undefined" && res.aOptions[0].value != '___pm_boot_strap___'){ @@ -831,9 +831,9 @@ var dynaformEditor={ } } var field=getField("JS_LIST","dynaforms_JSEditor"); - + var value=field.value; - + if (this.currentJS) { field.value=this.currentJS; diff --git a/workflow/engine/methods/services/sessionPersists.php b/workflow/engine/methods/services/sessionPersists.php index e43c711d1..bee675dd5 100755 --- a/workflow/engine/methods/services/sessionPersists.php +++ b/workflow/engine/methods/services/sessionPersists.php @@ -4,7 +4,10 @@ $response->status = isset($_SESSION['USER_LOGGED']); if (isset($_REQUEST['dynaformEditorParams'])) { $_SESSION['Current_Dynafom']['Parameters'] = unserialize(stripslashes($_REQUEST['dynaformEditorParams'])); if (isset($_REQUEST['DYN_UID'])) { - $dynaform = new dynaform(); + if (class_exists('Dynaform')) { + require_once 'classes/model/Dynaform.php'; + } + $dynaform = new Dynaform(); $dynaform->load($_REQUEST['DYN_UID']); G::LoadClass('dynaformEditor'); @@ -34,7 +37,7 @@ if (isset($_REQUEST['dynaformEditorParams'])) { if (isset($_REQUEST['dynaformRestoreValues'])) { $aRetValues = unserialize(stripslashes(base64_decode($_REQUEST['dynaformRestoreValues']))); - + if (isset($aRetValues['APPLICATION'])) { $_SESSION['APPLICATION'] = $aRetValues['APPLICATION']; }