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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
norahmollo
2013-05-06 13:50:58 +00:00
parent ed9d0cf3c7 9bdaf7b2e9
commit 8e60b5930b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.system.php
View File

@@ -956,6 +956,11 @@ class System
$folderId = 'classic'; $folderId = 'classic';
} }
$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
if ($partnerFlag && ($folderId == 'classic')){
continue;
}
$xmlConfiguration = file_get_contents( $configInformation ); $xmlConfiguration = file_get_contents( $configInformation );
$xmlConfigurationObj = G::xmlParser( $xmlConfiguration ); $xmlConfigurationObj = G::xmlParser( $xmlConfiguration );

4
workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js
View File

@@ -555,6 +555,10 @@ var Conditional = function(DYN_UID){
} }
this.saveCondition = function(){ this.saveCondition = function(){
if (!sessionPersits()) {
showPrompt('conditionalShowHide');
return;
}
var oTmp; var oTmp;
this.canSave = true; this.canSave = true;
oUID = getField('FCD_UID'); oUID = getField('FCD_UID');