Skip to content
Snippets Groups Projects
Commit 9096977c authored by Prasad's avatar Prasad
Browse files

Merge branch '159106005' into 'master'

Fixes: Verifying if the email module is active to link the view mail composer...

See merge request !1171
parents 2cb96db4 dd57b5b3
No related branches found
No related tags found
1 merge request!1171Fixes: Verifying if the email module is active to link the view mail composer...
...@@ -234,6 +234,10 @@ class ListViewController { ...@@ -234,6 +234,10 @@ class ListViewController {
$clickToCallLabel = vtranslate("LBL_CLICK_TO_CALL"); $clickToCallLabel = vtranslate("LBL_CLICK_TO_CALL");
} }
$emailModuleInstance = Vtiger_Module_Model::getInstance("Emails");
//checking the email module is active.
$isEmailModuleActive = $emailModuleInstance ? $emailModuleInstance->isActive() : false;
$data = array(); $data = array();
for ($i = 0; $i < $rowCount; ++$i) { for ($i = 0; $i < $rowCount; ++$i) {
//Getting the recordId //Getting the recordId
...@@ -412,7 +416,8 @@ class ListViewController { ...@@ -412,7 +416,8 @@ class ListViewController {
} }
} elseif ($fieldDataType == 'email') { } elseif ($fieldDataType == 'email') {
global $current_user; global $current_user;
if($current_user->internal_mailer == 1){ // checking email module is active and internal mail composer is on
if($isEmailModuleActive && $current_user->internal_mailer == 1){
//check added for email link in user detailview //check added for email link in user detailview
$value = "<a class='emailField' data-rawvalue=\"$rawValue\" onclick=\"Vtiger_Helper_Js.getInternalMailer($recordId,". $value = "<a class='emailField' data-rawvalue=\"$rawValue\" onclick=\"Vtiger_Helper_Js.getInternalMailer($recordId,".
"'$fieldName','$module');\">".textlength_check($value)."</a>"; "'$fieldName','$module');\">".textlength_check($value)."</a>";
......
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