Merge branch 'webservice_retrieve_api' into 'master' (072b5cee) · Commits · vtiger / vtigercrm

include/Webservices/VtigerModuleOperation.php

+4 −3

Original line number	Diff line number	Diff line
		@@ -174,6 +174,7 @@ class VtigerModuleOperation extends WebserviceEntityOperation {
		$meta = $parser->getObjectMetaData();
		$this->pearDB->startTransaction();
		$result = $this->pearDB->pquery($mysql_query, array());
		$tableIdColumn = $meta->getIdColumn();
		$error = $this->pearDB->hasFailedTransaction();
		$this->pearDB->completeTransaction();

		@@ -187,10 +188,10 @@ class VtigerModuleOperation extends WebserviceEntityOperation {
		$output = array();
		for($i=0; $i<$noofrows; $i++){
		$row = $this->pearDB->fetchByAssoc($result,$i);
		if(!$meta->hasPermission(EntityMeta::$RETRIEVE,$row["crmid"])){
		if(!$meta->hasPermission(EntityMeta::$RETRIEVE,$row[$tableIdColumn])){
		continue;
		}
		$output[$row["crmid"]] = DataTransform::sanitizeDataWithColumn($row,$meta);
		$output[$row[$tableIdColumn]] = DataTransform::sanitizeDataWithColumn($row,$meta);
		}

		$newOutput = array();