From 7b6daaa8fb38a0d91988c8db91d4f96967d15706 Mon Sep 17 00:00:00 2001
From: Alan Bell <alanbell@ubuntu.com>
Date: Tue, 20 Oct 2015 11:00:27 +0100
Subject: [PATCH] fix #2 allow projects to show up on the calendar
---
modules/Calendar/actions/Feed.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/Calendar/actions/Feed.php b/modules/Calendar/actions/Feed.php
index ff1fd139f..301389d6f 100644
--- a/modules/Calendar/actions/Feed.php
+++ b/modules/Calendar/actions/Feed.php
@@ -334,7 +334,7 @@ class Calendar_Feed_Action extends Vtiger_BasicAjax_Action {
$user = Users_Record_Model::getCurrentUserModel();
$userAndGroupIds = array_merge(array($user->getId()),$this->getGroupsIdsForUsers($user->getId()));
$params = array($start,$end,$start);
- $params = array_merge($params, $userAndGroupIds);
+ $params = array_merge($userAndGroupIds, $params);
$query = "SELECT projectname, startdate, targetenddate, crmid FROM vtiger_project";
$query.= " INNER JOIN vtiger_crmentity ON vtiger_project.projectid = vtiger_crmentity.crmid";
@@ -392,4 +392,4 @@ class Calendar_Feed_Action extends Vtiger_BasicAjax_Action {
}
}
-}
\ No newline at end of file
+}
--
GitLab