fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 14573 Re - login functionality in dynaform editor timeout is not working SOLVED

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-04-16 15:03:15 -04:00
parent cc36fd9bf8
commit 94bb669be1
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.dynaformEditor.php
View File

@@ -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');
}

10
workflow/engine/js/dynaformEditor/core/dynaformEditor.js
View File

@@ -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;

7
workflow/engine/methods/services/sessionPersists.php
View File

@@ -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'];
}