From bb2c7b5fc2fb46eea0570a8251389d8a10479e50 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Fri, 3 Feb 2017 11:11:45 +0530
Subject: [PATCH] Fixes #404 - Warning: Missing argument 4 for
CRMEntity::get_dependents_list(), called in modules/Vtiger/models/Module.php
on line 1500 and defined in data/CRMEntity.php on line 1870
---
modules/Accounts/models/Module.php | 4 ++--
modules/Contacts/models/Module.php | 4 ++--
modules/HelpDesk/models/Module.php | 4 ++--
modules/Inventory/models/Module.php | 4 ++--
modules/Leads/models/Module.php | 4 ++--
modules/Potentials/models/Module.php | 4 ++--
modules/Vtiger/models/Module.php | 4 ++--
.../Projects/Project/modules/Project/models/Module.php | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/modules/Accounts/models/Module.php b/modules/Accounts/models/Module.php
index 88a859b55..ab209ef3f 100644
--- a/modules/Accounts/models/Module.php
+++ b/modules/Accounts/models/Module.php
@@ -78,7 +78,7 @@ class Accounts_Module_Model extends Vtiger_Module_Model {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
if ($functionName === 'get_activities') {
$focus = CRMEntity::getInstance($this->getName());
$focus->id = $recordId;
@@ -115,7 +115,7 @@ class Accounts_Module_Model extends Vtiger_Module_Model {
// There could be more than one contact for an activity.
$query .= ' GROUP BY vtiger_activity.activityid';
} else {
- $query = parent::getRelationQuery($recordId, $functionName, $relatedModule);
+ $query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
}
return $query;
diff --git a/modules/Contacts/models/Module.php b/modules/Contacts/models/Module.php
index f62a62307..3859376a3 100644
--- a/modules/Contacts/models/Module.php
+++ b/modules/Contacts/models/Module.php
@@ -228,7 +228,7 @@ class Contacts_Module_Model extends Vtiger_Module_Model {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
if ($functionName === 'get_activities') {
$userNameSql = getSqlForNameInDisplayFormat(array('first_name' => 'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
@@ -253,7 +253,7 @@ class Contacts_Module_Model extends Vtiger_Module_Model {
$query = appendFromClauseToQuery($query, $nonAdminQuery);
}
} else {
- $query = parent::getRelationQuery($recordId, $functionName, $relatedModule);
+ $query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
}
return $query;
diff --git a/modules/HelpDesk/models/Module.php b/modules/HelpDesk/models/Module.php
index d8ded57a5..3cd819dc1 100644
--- a/modules/HelpDesk/models/Module.php
+++ b/modules/HelpDesk/models/Module.php
@@ -142,7 +142,7 @@ class HelpDesk_Module_Model extends Vtiger_Module_Model {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
if ($functionName === 'get_activities') {
$userNameSql = getSqlForNameInDisplayFormat(array('first_name' => 'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
@@ -166,7 +166,7 @@ class HelpDesk_Module_Model extends Vtiger_Module_Model {
$query = appendFromClauseToQuery($query, $nonAdminQuery);
}
} else {
- $query = parent::getRelationQuery($recordId, $functionName, $relatedModule);
+ $query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
}
return $query;
diff --git a/modules/Inventory/models/Module.php b/modules/Inventory/models/Module.php
index b42225613..4ac730147 100644
--- a/modules/Inventory/models/Module.php
+++ b/modules/Inventory/models/Module.php
@@ -62,7 +62,7 @@ class Inventory_Module_Model extends Vtiger_Module_Model {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
if ($functionName === 'get_activities') {
$userNameSql = getSqlForNameInDisplayFormat(array('first_name' => 'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
@@ -86,7 +86,7 @@ class Inventory_Module_Model extends Vtiger_Module_Model {
$query = appendFromClauseToQuery($query, $nonAdminQuery);
}
} else {
- $query = parent::getRelationQuery($recordId, $functionName, $relatedModule);
+ $query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
}
return $query;
diff --git a/modules/Leads/models/Module.php b/modules/Leads/models/Module.php
index b46e59284..f7b8b5552 100644
--- a/modules/Leads/models/Module.php
+++ b/modules/Leads/models/Module.php
@@ -275,7 +275,7 @@ class Leads_Module_Model extends Vtiger_Module_Model {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
if ($functionName === 'get_activities') {
$userNameSql = getSqlForNameInDisplayFormat(array('first_name' => 'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
@@ -299,7 +299,7 @@ class Leads_Module_Model extends Vtiger_Module_Model {
$query = appendFromClauseToQuery($query, $nonAdminQuery);
}
} else {
- $query = parent::getRelationQuery($recordId, $functionName, $relatedModule);
+ $query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
}
return $query;
diff --git a/modules/Potentials/models/Module.php b/modules/Potentials/models/Module.php
index 3fe02a598..8d61304ec 100644
--- a/modules/Potentials/models/Module.php
+++ b/modules/Potentials/models/Module.php
@@ -256,7 +256,7 @@ class Potentials_Module_Model extends Vtiger_Module_Model {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
if ($functionName === 'get_activities') {
$userNameSql = getSqlForNameInDisplayFormat(array('first_name' => 'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
@@ -280,7 +280,7 @@ class Potentials_Module_Model extends Vtiger_Module_Model {
$query = appendFromClauseToQuery($query, $nonAdminQuery);
}
} else {
- $query = parent::getRelationQuery($recordId, $functionName, $relatedModule);
+ $query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
}
return $query;
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index 595b87375..8ce16d3f2 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -1491,13 +1491,13 @@ class Vtiger_Module_Model extends Vtiger_Module {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
$relatedModuleName = $relatedModule->getName();
$focus = CRMEntity::getInstance($this->getName());
$focus->id = $recordId;
- $result = $focus->$functionName($recordId, $this->getId(), $relatedModule->getId());
+ $result = $focus->$functionName($recordId, $this->getId(), $relatedModule->getId(), $relationId);
$query = $result['query'] .' '. $this->getSpecificRelationQuery($relatedModuleName);
$nonAdminQuery = $this->getNonAdminAccessControlQueryForRelation($relatedModuleName);
diff --git a/pkg/vtiger/modules/Projects/Project/modules/Project/models/Module.php b/pkg/vtiger/modules/Projects/Project/modules/Project/models/Module.php
index 24ab5f3aa..acaf367c0 100644
--- a/pkg/vtiger/modules/Projects/Project/modules/Project/models/Module.php
+++ b/pkg/vtiger/modules/Projects/Project/modules/Project/models/Module.php
@@ -66,9 +66,9 @@ class Project_Module_Model extends Vtiger_Module_Model {
* @param Vtiger_Module_Model $relatedModule
* @return <String>
*/
- public function getRelationQuery($recordId, $functionName, $relatedModule,$relationId) {
+ public function getRelationQuery($recordId, $functionName, $relatedModule, $relationId) {
$relatedModuleName = $relatedModule->getName();
- $query = parent::getRelationQuery($recordId, $functionName, $relatedModule,$relationId);
+ $query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
return $query;
}
--
GitLab