Merge branch 'webservice_tag_fetch' into 'master'

Fixes #1217 Tags details fetched for requests made via webservices

See merge request !505

include/Webservices/VtigerModuleOperation.php

@@ -190,7 +190,7 @@ class VtigerModuleOperation extends WebserviceEntityOperation {
 			if(!$meta->hasPermission(EntityMeta::$RETRIEVE,$row["crmid"])){
 				continue;
 			}
-			$output[] = DataTransform::sanitizeDataWithColumn($row,$meta);
+			$output[$row["crmid"]] = DataTransform::sanitizeDataWithColumn($row,$meta);
 		}
 		
 		$newOutput = array();

modules/Vtiger/models/Tag.php

@@ -299,6 +299,43 @@ class Vtiger_Tag_Model extends Vtiger_Base_Model {
 		$result = $db->pquery($checkQuery, array($tagId, $userIdToExclude));
 		return $db->num_rows($result) > 0 ? true : false;
 	}
+    
+    /**
+     * Function used to return tags for list for records
+     * @param <Array> $records - record ids
+     * @return <Array> tags
+     */
+    public static function getAllAccessibleTags($records) {
+        $tagsList = array();
+        if(count($records) == 0) return $tagsList;
+        
+        $currentUser = Users_Record_Model::getCurrentUserModel();
+        
+        $db = PearDatabase::getInstance();
+        $query = "SELECT tag,object_id FROM vtiger_freetags 
+                    INNER JOIN vtiger_freetagged_objects ON vtiger_freetags.id = vtiger_freetagged_objects.tag_id 
+                    WHERE (vtiger_freetagged_objects.tagger_id = ? OR vtiger_freetags.visibility='public') 
+                    AND vtiger_freetagged_objects.object_id IN 
+                    (" . generateQuestionMarks($records) . ")";
+        $params = array($currentUser->getId());
+        $params = array_merge($params, $records);
+        
+        $result = $db->pquery($query , $params);
+        $num_rows = $db->num_rows($result);
+
+        
+        for($i=0; $i<$num_rows; $i++) {
+            $tagName = decode_html($db->query_result($result, $i, 'tag'));
+            $record = decode_html($db->query_result($result, $i, 'object_id'));
+            
+            if(empty($tagsList[$record])) {
+                $tagsList[$record] = $tagName;
+            } else {
+                $tagsList[$record] .= ','.$tagName;
+            }
+        }
+        return $tagsList;
+    }
 }
 
 ?>