fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into BUG-9830

Browse Source
This commit is contained in:
Victor Saisa Lopez
2012-10-31 14:46:08 -04:00
parent 7a1483b81b 3eb5ae70ab
commit 74f577b5f5
3 changed files with 207 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ class dynaformEditor extends WebResource
var DYNAFORM_URL="' . $Parameters['URL'] . '";
leimnud.event.add(window,"load",function(){ loadEditor(); });
');
$oHeadPublisher->addScriptCode(' var jsMeta;');
$oHeadPublisher->addScriptCode(' var jsMeta;var usernameLogged = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";');
G::RenderPage("publish", 'blank');
}
@@ -923,4 +923,3 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
}
}
}

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

File diff suppressed because it is too large Load Diff

6
workflow/engine/methods/dynaforms/conditionalShowHide.php
View File

@@ -33,8 +33,10 @@ $DISPLAY_MAX_SIZE = 25;
global $_DBArray;
$oFieldCondition = new FieldCondition();
$DYN_UID = $_SESSION['Current_Dynafom']['Parameters']['DYN_UID'];
$aRows = $oFieldCondition->getAllByDynUid( $DYN_UID );
if (isset($_SESSION['Current_Dynafom']['Parameters']['DYN_UID'])) {
$DYN_UID = $_SESSION['Current_Dynafom']['Parameters']['DYN_UID'];
$aRows = $oFieldCondition->getAllByDynUid( $DYN_UID );
}
$aFieldNames = Array ('FCD_NRO','FCD_UID','FCD_FUNCTION','FCD_FIELDS','FCD_CONDITION','FCD_EVENTS','FCD_EVENT_OWNERS','FCD_STATUS','FCD_DYN_UID' );