From e2ee160fba2a09129eaaa979e04c69985abc58ad Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 3 May 2013 12:11:45 -0400 Subject: [PATCH 1/2] DOCSYSTEM Bandera para quitar el skin classic de la lista Bandera para quitar el skin classic de la lista --- workflow/engine/classes/class.system.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index fe27b8b0a..808114fc5 100755 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -956,6 +956,11 @@ class System $folderId = 'classic'; } + $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false; + if ($partnerFlag && ($folderId == 'classic')){ + continue; + } + $xmlConfiguration = file_get_contents( $configInformation ); $xmlConfigurationObj = G::xmlParser( $xmlConfiguration ); From 59f14ee6563b3c7435c68cbcd91ed9dff7fe330a Mon Sep 17 00:00:00 2001 From: jennylee Date: Fri, 3 May 2013 12:16:14 -0400 Subject: [PATCH 2/2] Error on the Conditional Editor tab on Dynaform Editor. When adding a new Condition, if you lose session before saving, PM sends you back into the Admin Tab instead of the Condition Editor Tab. --- workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js b/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js index 63b8ab6dc..9e8ede889 100755 --- a/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js +++ b/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js @@ -555,6 +555,10 @@ var Conditional = function(DYN_UID){ } this.saveCondition = function(){ + if (!sessionPersits()) { + showPrompt('conditionalShowHide'); + return; + } var oTmp; this.canSave = true; oUID = getField('FCD_UID');