diff --git a/modules/Home/models/Module.php b/modules/Home/models/Module.php index f2fa1265ac9268443ec8b952aa0e7ff24c4a3225..0e3a0034730ec2c44118b359e729eebf8c60af77 100644 --- a/modules/Home/models/Module.php +++ b/modules/Home/models/Module.php @@ -175,7 +175,7 @@ class Home_Module_Model extends Vtiger_Module_Model { * @param <String> $recordId - record id * @return <Array> */ - function getCalendarActivities($mode, $pagingModel, $user) { + function getCalendarActivities($mode, $pagingModel, $user,$recordId=null) { $currentUser = Users_Record_Model::getCurrentUserModel(); $db = PearDatabase::getInstance(); diff --git a/modules/Vtiger/dashboards/CalendarActivities.php b/modules/Vtiger/dashboards/CalendarActivities.php index 6ace2ed21bb406957d1a8670ce47694875b0bb57..9eddc5ba32ba8ce1a0f12f6e5ab077654476efd6 100644 --- a/modules/Vtiger/dashboards/CalendarActivities.php +++ b/modules/Vtiger/dashboards/CalendarActivities.php @@ -24,7 +24,7 @@ class Vtiger_CalendarActivities_Dashboard extends Vtiger_IndexAjax_View { $user = $request->get('type'); $moduleModel = Vtiger_Module_Model::getInstance($moduleName); - $calendarActivities = $moduleModel->getCalendarActivities('upcoming', $pagingModel, $user); + $calendarActivities = $moduleModel->getCalendarActivities('upcoming', $pagingModel, $user,null); $widget = Vtiger_Widget_Model::getInstance($linkId, $currentUser->getId()); diff --git a/modules/Vtiger/dashboards/OverdueActivities.php b/modules/Vtiger/dashboards/OverdueActivities.php index 6a3d81ddbb4a3f27287844ddeb1379d3ee47e7ef..98bf4e48d218050dd861e2257680d0cf2db01150 100644 --- a/modules/Vtiger/dashboards/OverdueActivities.php +++ b/modules/Vtiger/dashboards/OverdueActivities.php @@ -23,7 +23,7 @@ Class Vtiger_OverdueActivities_Dashboard extends Vtiger_IndexAjax_View { $user = $request->get('type'); $moduleModel = Vtiger_Module_Model::getInstance($moduleName); - $overDueActivities = $moduleModel->getCalendarActivities('overdue', $pagingModel, $user); + $overDueActivities = $moduleModel->getCalendarActivities('overdue', $pagingModel, $user,null); $widget = Vtiger_Widget_Model::getInstance($linkId, $currentUser->getId()); $viewer = $this->getViewer($request); diff --git a/modules/Vtiger/models/Menu.php b/modules/Vtiger/models/Menu.php index e30d3a74fba49630e238e8257d6ece15611ac0e5..b186595663637220d275bc1e47774065b0b356cb 100644 --- a/modules/Vtiger/models/Menu.php +++ b/modules/Vtiger/models/Menu.php @@ -18,7 +18,7 @@ class Vtiger_Menu_Model extends Vtiger_Module_Model { * @param <Boolean> $sequenced - true/false * @return <Array> - List of Vtiger_Menu_Model instances */ - public static function getAll($sequenced = false) { + public static function getAll($presence = array(), $restrictedModulesList = array(),$sequenced = false) { $currentUser = Users_Record_Model::getCurrentUserModel(); $userPrivModel = Users_Privileges_Model::getCurrentUserPrivilegesModel(); $restrictedModulesList = array('Emails', 'ProjectMilestone', 'ProjectTask', 'ModComments', 'Integration', 'PBXManager', 'Dashboard', 'Home'); diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php index 199f5f32096c1047963a83df37dcce13ea78f946..43e683c4d14e9a8436a9b9cd4b7ac0a579df74d6 100644 --- a/modules/Vtiger/models/Module.php +++ b/modules/Vtiger/models/Module.php @@ -708,7 +708,7 @@ class Vtiger_Module_Model extends Vtiger_Module { * @param <array> $restrictedModulesList * @return <array> List of module models <Vtiger_Module_Model> */ - public static function getAll($presence = array(), $restrictedModulesList = array()) { + public static function getAll($presence = array(), $restrictedModulesList = array(),$sequenced = false) { $db = PearDatabase::getInstance(); self::preModuleInitialize2(); $cacheKey = 'modules';