diff --git a/modules/Settings/Profiles/models/Record.php b/modules/Settings/Profiles/models/Record.php index 9ddda530e5af40136eb4f3a79b59da316e05ead6..86d13394d50edc7b5f9680cbaf3f943b82d78404 100644 --- a/modules/Settings/Profiles/models/Record.php +++ b/modules/Settings/Profiles/models/Record.php @@ -455,6 +455,7 @@ class Settings_Profiles_Record_Model extends Settings_Vtiger_Record_Model { $actionModels = Vtiger_Action_Model::getAll(true); foreach($allModuleModules as $tabId => $moduleModel) { if($moduleModel->isActive()) { + $profilePermissions[$moduleModel->getId()] = isset($profilePermissions[$moduleModel->getId()]) ? $profilePermissions[$moduleModel->getId()] : ''; $this->saveModulePermissions($moduleModel, $profilePermissions[$moduleModel->getId()]); } else { $permissions = array(); @@ -614,7 +615,7 @@ class Settings_Profiles_Record_Model extends Settings_Vtiger_Record_Model { // Enable module permission in profile2tab table only if either its an extension module or the entity module has atleast 1 action enabled if($actionEnabled) { - $isModulePermitted = isset($permissions['is_permitted']) ? $this->tranformInputPermissionValue($permissions['is_permitted']) :null; + $isModulePermitted = isset($permissions['is_permitted']) ? $this->tranformInputPermissionValue($permissions['is_permitted']) :''; } else { $isModulePermitted = Settings_Profiles_Module_Model::NOT_PERMITTED_VALUE; } diff --git a/modules/Settings/Roles/models/Record.php b/modules/Settings/Roles/models/Record.php index 213b45f99cb01946de63d7a9b69a9e6016f10a7d..1ad36793ae260152309af947fcba75e444d1f96b 100644 --- a/modules/Settings/Roles/models/Record.php +++ b/modules/Settings/Roles/models/Record.php @@ -62,7 +62,7 @@ class Settings_Roles_Record_Model extends Settings_Vtiger_Record_Model { * @return <Settings_Roles_Record_Model> instance */ public function getParent() { - if(!$this->parent) { + if(!isset($this->parent)) { $parentRoleString = $this->getParentRoleString(); $parentComponents = explode('::', $parentRoleString); $noOfRoles = php7_count($parentComponents);