fix(Campaigns) eliminate special status picklist in webservice relate…

…d query and the warnings it was causing. fixes #157 Thanks John
tsolucio · Aug 16, 2017 · 72841b8 · 72841b8
1 parent 3a5bbdf
commit 72841b8
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/modules/Campaigns/Campaigns.php b/modules/Campaigns/Campaigns.php
@@ -193,9 +193,9 @@ function get_accounts($id, $cur_tab_id, $rel_tab_id, $actions = false) {
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if($return_value == null)
+		if ($return_value == null)
 			$return_value = Array();
-		else if($is_CampaignStatusAllowed) {
+		else if ($is_CampaignStatusAllowed and !empty($return_value['header'])) {
 			$statusPos = count($return_value['header']) - 2; // Last column is for Actions, exclude that. Also the index starts from 0, so reduce one more count.
 			$return_value = $this->add_status_popup($return_value, $statusPos, 'Accounts');
 		}
@@ -293,9 +293,9 @@ function get_contacts($id, $cur_tab_id, $rel_tab_id, $actions=false) {
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if($return_value == null)
+		if ($return_value == null)
 			$return_value = Array();
-		else if($is_CampaignStatusAllowed) {
+		else if ($is_CampaignStatusAllowed and !empty($return_value['header'])) {
 			$statusPos = count($return_value['header']) - 2; // Last column is for Actions, exclude that. Also the index starts from 0, so reduce one more count.
 			$return_value = $this->add_status_popup($return_value, $statusPos, 'Contacts');
 		}
@@ -390,9 +390,9 @@ function get_leads($id, $cur_tab_id, $rel_tab_id, $actions=false) {
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if($return_value == null)
+		if ($return_value == null)
 			$return_value = Array();
-		else if($is_CampaignStatusAllowed) {
+		else if ($is_CampaignStatusAllowed and !empty($return_value['header'])) {
 			$statusPos = count($return_value['header']) - 2; // Last column is for Actions, exclude that. Also the index starts from 0, so reduce one more count.
 			$return_value = $this->add_status_popup($return_value, $statusPos, 'Leads');
 		}
@@ -409,32 +409,29 @@ function get_leads($id, $cur_tab_id, $rel_tab_id, $actions=false) {
 	 * @param - $status_column index of the status column in the list.
 	 * returns true on success
 	 */
-	function add_status_popup($related_list, $status_column = 7, $related_module)
-	{
+	function add_status_popup($related_list, $status_column = 7, $related_module) {
 		global $adb;
 		if (empty($this->campaignrelstatus)) {
 			$this->campaignrelstatus = array();
 		}
 		if (count($this->campaignrelstatus)==0) {
 			$result = $adb->query('SELECT * FROM vtiger_campaignrelstatus;');
-			while($row = $adb->fetchByAssoc($result))
-			{
+			while ($row = $adb->fetchByAssoc($result)) {
 				$r = $row;
 				$r['campaignrelstatusi18n'] = getTranslatedString($row['campaignrelstatus'],'Campaigns');
 				$this->campaignrelstatus[$row['campaignrelstatus']] = $r;
 			}
 		}
-		foreach($related_list['entries'] as $key => &$entry)
-		{
-			$popupitemshtml = '';
-			foreach($this->campaignrelstatus as $campaingrelstatus)
-			{
-				$camprelstatus = $campaingrelstatus['campaignrelstatusi18n'];
-				$popupitemshtml .= "<a onmouseover=\"javascript: showBlock('campaignstatus_popup_$key')\" href=\"javascript:updateCampaignRelationStatus('$related_module', '".$this->id."', '$key', '".$campaingrelstatus['campaignrelstatusid']."', '".addslashes($camprelstatus)."');\">$camprelstatus</a><br />";
+		if (isset($related_list['entries'])) {
+			foreach ($related_list['entries'] as $key => &$entry) {
+				$popupitemshtml = '';
+				foreach ($this->campaignrelstatus as $campaingrelstatus) {
+					$camprelstatus = $campaingrelstatus['campaignrelstatusi18n'];
+					$popupitemshtml .= "<a onmouseover=\"javascript: showBlock('campaignstatus_popup_$key')\" href=\"javascript:updateCampaignRelationStatus('$related_module', '".$this->id."', '$key', '".$campaingrelstatus['campaignrelstatusid']."', '".addslashes($camprelstatus)."');\">$camprelstatus</a><br />";
+				}
+				$popuphtml = '<div onmouseover="javascript:clearTimeout(statusPopupTimer);" onmouseout="javascript:closeStatusPopup(\'campaignstatus_popup_'.$key.'\');" style="margin-top: -14px; width: 200px;" id="campaignstatus_popup_'.$key.'" class="calAction"><div style="background-color: #FFFFFF; padding: 8px;">'.$popupitemshtml.'</div></div>';
+				$entry[$status_column] = "<a href=\"javascript: showBlock('campaignstatus_popup_$key');\">[+]</a> <span id='campaignstatus_$key'>".$entry[$status_column]."</span>".$popuphtml;
 			}
-			$popuphtml = '<div onmouseover="javascript:clearTimeout(statusPopupTimer);" onmouseout="javascript:closeStatusPopup(\'campaignstatus_popup_'.$key.'\');" style="margin-top: -14px; width: 200px;" id="campaignstatus_popup_'.$key.'" class="calAction"><div style="background-color: #FFFFFF; padding: 8px;">'.$popupitemshtml.'</div></div>';
-
-			$entry[$status_column] = "<a href=\"javascript: showBlock('campaignstatus_popup_$key');\">[+]</a> <span id='campaignstatus_$key'>".$entry[$status_column]."</span>".$popuphtml;
 		}
 		return $related_list;
 	}