Skip to content
Snippets Groups Projects
Commit 5a631fa5 authored by Prasad's avatar Prasad
Browse files

Fixes #1555: Loose coupled Project and Potentials with existence check

parent 6756b57b
No related branches found
No related tags found
No related merge requests found
...@@ -86,7 +86,7 @@ class Potentials_DetailView_Model extends Vtiger_DetailView_Model { ...@@ -86,7 +86,7 @@ class Potentials_DetailView_Model extends Vtiger_DetailView_Model {
); );
} }
if($currentUserModel->hasModuleActionPermission($projectModuleModel->getId(), 'CreateView') && !$recordModel->isPotentialConverted()) { if($projectModuleModel && $currentUserModel->hasModuleActionPermission($projectModuleModel->getId(), 'CreateView') && !$recordModel->isPotentialConverted()) {
$basicActionLink = array( $basicActionLink = array(
'linktype' => 'DETAILVIEWBASIC', 'linktype' => 'DETAILVIEWBASIC',
'linklabel' => vtranslate('LBL_CREATE_PROJECT', $recordModel->getModuleName()), 'linklabel' => vtranslate('LBL_CREATE_PROJECT', $recordModel->getModuleName()),
......
...@@ -99,7 +99,7 @@ class Potentials_Record_Model extends Vtiger_Record_Model { ...@@ -99,7 +99,7 @@ class Potentials_Record_Model extends Vtiger_Record_Model {
} }
$moduleModel = Vtiger_Module_Model::getInstance($moduleName); $moduleModel = Vtiger_Module_Model::getInstance($moduleName);
if ($moduleModel->isActive()) { if ($moduleModel && $moduleModel->isActive()) {
$fieldModels = $moduleModel->getFields(); $fieldModels = $moduleModel->getFields();
foreach ($fieldModels as $fieldName => $fieldModel) { foreach ($fieldModels as $fieldName => $fieldModel) {
if($fieldModel->isMandatory() && !in_array($fieldName, array('assigned_user_id', 'potentialid'))) { if($fieldModel->isMandatory() && !in_array($fieldName, array('assigned_user_id', 'potentialid'))) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment