Skip to content
Snippets Groups Projects
Commit 9db88584 authored by Uma's avatar Uma
Browse files

Activites related-list inline search in Organization module

parent 2f1450b2
No related branches found
No related tags found
No related merge requests found
......@@ -250,6 +250,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model {
public function getEntries($pagingModel) {
$db = PearDatabase::getInstance();
$parentModule = $this->getParentRecordModel()->getModule();
$parentModuleName = $parentModule->get('name');
$relationModule = $this->getRelationModel()->getRelationModuleModel();
$relationModuleName = $relationModule->get('name');
$relatedColumnFields = $relationModule->getConfigureRelatedListFields();
......@@ -288,7 +289,12 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model {
}
}
$whereQuerySplit = split("WHERE", $queryGenerator->getWhereClause());
$query.=" AND " . $whereQuerySplit[1];
if($parentModuleName == 'Accounts' && $relationModuleName == 'Calendar' && (stripos($query, "GROUP BY") !== false)) {
$splitQuery = split('GROUP BY', $query);
$query = $splitQuery[0]." AND ".$whereQuerySplit[1].' GROUP BY '.$splitQuery[1];
} else {
$query.=" AND " . $whereQuerySplit[1];
}
}
$startIndex = $pagingModel->getStartIndex();
......
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