diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 084576f90..6bb42a18b 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -35,6 +35,9 @@ class pmDynaform public function getDynaform() { + if (!isset($this->fields["CURRENT_DYNAFORM"])) { + return; + } if ($this->record != null) { return $this->record; } @@ -56,6 +59,9 @@ class pmDynaform public function getCredentials() { + if (!isset($_SESSION['USER_LOGGED'])) { + return; + } if ($this->credentials != null) { return $this->credentials; } @@ -430,3 +436,4 @@ class pmDynaform } } + diff --git a/workflow/engine/menus/cases.php b/workflow/engine/menus/cases.php index 2a22e0e1b..4445714e4 100755 --- a/workflow/engine/menus/cases.php +++ b/workflow/engine/menus/cases.php @@ -30,7 +30,10 @@ $G_TMP_MENU->AddIdRawOption('CASES_START_CASE', 'casesStartPage?action=startCase G::LoadTranslation('ID_NEW_CASE'), ''); /*----------------------------------********---------------------------------*/ -$G_TMP_MENU->AddIdRawOption('CASE_CONSOLIDATED_1', 'casesConsolidatedListExtJs?action=consolidated', 'Batch Routing', ''); +$licensedFeatures = & PMLicensedFeatures::getSingleton(); +if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) { + $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated', 'Batch Routing', ''); +} /*----------------------------------********---------------------------------*/ $G_TMP_MENU->AddIdRawOption('CASES_INBOX', 'casesListExtJs?action=todo', G::LoadTranslation('ID_INBOX'), diff --git a/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css b/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css index 6dcbbd266..2f58ea405 100644 --- a/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css +++ b/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css @@ -438,12 +438,12 @@ button.x-btn-text:focus, background-image: url(/skins/neoclassic/images/icons_silk/sprites.png) !important; background-position: 0 -8497px !important; } -.ICON_CONSOLIDATED_CASES { +.ICON_CONSOLIDATED_CASES{ /*ss_consolidated_cases*/ - - background-image: url(/skins/neoclassic/images/icons_silk/sprites.png) !important; - background-position: 0 -18500px !important; + background-image:url(/images/icons_silk/sprites.png) !important; + background-position:0 -18500px !important } + .ICON_CASES_DELETE { background-image: url(/skins/neoclassic/images/delete-16x16.gif) !important; }