diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php index f06cb293a..3e261cbb4 100644 --- a/workflow/engine/classes/model/Department.php +++ b/workflow/engine/classes/model/Department.php @@ -415,9 +415,9 @@ function getDepartments( $DepParent ) { $manager = $oDepartment->getDepManager(); if ($manager != ''){ $UserUID = $RBAC->load($manager); - $node['DEP_MANAGER_USERNAME'] = $UserUID['USR_USERNAME']; - $node['DEP_MANAGER_FIRSTNAME'] = $UserUID['USR_FIRSTNAME']; - $node['DEP_MANAGER_LASTNAME'] = $UserUID['USR_LASTNAME']; + $node['DEP_MANAGER_USERNAME'] = isset($UserUID['USR_USERNAME'])?$UserUID['USR_USERNAME']:''; + $node['DEP_MANAGER_FIRSTNAME'] = isset($UserUID['USR_FIRSTNAME'])?$UserUID['USR_FIRSTNAME']:''; + $node['DEP_MANAGER_LASTNAME'] = isset($UserUID['USR_LASTNAME'])?$UserUID['USR_FIRSTNAME']:''; }else{ $node['DEP_MANAGER_USERNAME'] = ''; $node['DEP_MANAGER_FIRSTNAME'] = ''; diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index d657c56ad..5f231a6f8 100644 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -97,6 +97,14 @@ public function userExists($UsrUid) throw(new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" )); } } + catch (PropelException $e){ //capture invalid birthday date and replace by null + $msg = $e->getMessage(); + if (strpos('Unable to parse value of [usr_birthday]', $msg) != -1) { + $oRow->setUsrBirthday(null); + $oRow->save(); + return $this->load($UsrUid); + } + } catch (Exception $oError) { throw($oError); } diff --git a/workflow/engine/methods/departments/departments_Ajax.php b/workflow/engine/methods/departments/departments_Ajax.php index 86587e266..2196b2113 100644 --- a/workflow/engine/methods/departments/departments_Ajax.php +++ b/workflow/engine/methods/departments/departments_Ajax.php @@ -245,7 +245,6 @@ switch ($_POST['action']) case 'updateDepartment': try{ $dep_name = $_REQUEST['name']; - echo $dep_name; $dep_uid = $_REQUEST['uid']; $dep_manager = $_REQUEST['manager']; $dep_status = $_REQUEST['status'];