From b789aea1f42750a944af2f37cc96cef96c4c7067 Mon Sep 17 00:00:00 2001
From: prasad <prasad@vtiger.com>
Date: Wed, 13 Jul 2016 19:27:25 +0530
Subject: [PATCH] Removed redundant logic in finding related record.
---
.../modules/MailManager/views/Relation.php | 30 +++++++++----------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/views/Relation.php b/pkg/vtiger/modules/MailManager/modules/MailManager/views/Relation.php
index b8d9cd082..5a6744ed3 100755
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/views/Relation.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/views/Relation.php
@@ -423,28 +423,26 @@ class MailManager_Relation_View extends MailManager_Abstract_View {
*/
public function lookupModuleRecordsWithEmail($module, $emails) {
$currentUserModel = vglobal('current_user');
- //could be to multiple email addresses
+ //could be to multiple email addresses
$results = array();
- foreach(explode(",",$emails) as $email){
- $query = $this->buildSearchQuery($module, $email, 'EMAIL');
- $qresults = vtws_query( $query, $currentUserModel );
- $describe = $this->ws_describe($module);
- $labelFields = explode(',', $describe['labelFields']);
- foreach($qresults as $qresult) {
- $labelValues = array();
- foreach($labelFields as $fieldname) {
- if(isset($qresult[$fieldname])) $labelValues[] = $qresult[$fieldname];
- }
- $ids = vtws_getIdComponents($qresult['id']);
- $results[] = array( 'wsid' => $qresult['id'], 'id' => $ids[1], 'label' => implode(' ', $labelValues));
+ foreach(explode(",",$emails) as $email){
+ $query = $this->buildSearchQuery($module, $email, 'EMAIL');
+ $qresults = vtws_query( $query, $currentUserModel );
+ $describe = $this->ws_describe($module);
+ $labelFields = explode(',', $describe['labelFields']);
+ foreach($qresults as $qresult) {
+ $labelValues = array();
+ foreach($labelFields as $fieldname) {
+ if(isset($qresult[$fieldname])) $labelValues[] = $qresult[$fieldname];
+ }
+ $ids = vtws_getIdComponents($qresult['id']);
+ $results[] = array( 'wsid' => $qresult['id'], 'id' => $ids[1], 'label' => implode(' ', $labelValues));
}
- $ids = vtws_getIdComponents($qresult['id']);
- $results[] = array( 'wsid' => $qresult['id'], 'id' => $ids[1], 'label' => implode(' ', $labelValues));
}
return $results;
}
- public function validateRequest(Vtiger_Request $request) {
+ public function validateRequest(Vtiger_Request $request) {
return $request->validateWriteAccess();
}
}
--
GitLab