From d9ee60e67cd7e7e36a5bdb5a36bec6073ee07bde Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Mon, 9 Mar 2020 17:45:31 +0530
Subject: [PATCH] Fixes #548 Calendar View truncates Activity Types
---
layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl | 2 +-
layouts/v7/modules/Calendar/resources/Calendar.js | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl b/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl
index 43462ffb8..90847f8e8 100644
--- a/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl
+++ b/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl
@@ -26,7 +26,7 @@
</div>
<hr style="margin: 5px 0;">
<div class="list-menu-content">
- <div id="{$SIDEBARWIDGET->get('linklabel')}" class="sidebar-widget-body activitytypes" style="max-height: 500px;">
+ <div id="{$SIDEBARWIDGET->get('linklabel')}" class="sidebar-widget-body activitytypes">
<div style="text-align:center;"><img src="layouts/v7/skins/images/loading.gif"></div>
</div>
</div>
diff --git a/layouts/v7/modules/Calendar/resources/Calendar.js b/layouts/v7/modules/Calendar/resources/Calendar.js
index 0b938b775..e3926669f 100644
--- a/layouts/v7/modules/Calendar/resources/Calendar.js
+++ b/layouts/v7/modules/Calendar/resources/Calendar.js
@@ -952,6 +952,8 @@ Vtiger.Class("Calendar_Calendar_Js", {
app.request.post({data: dataParams}).then(function (e, data) {
if (!e) {
widgetBody.html(data);
+ let fullCalendarViewHeight = $('.fc-view-container').height();
+ widgetBody.css('max-height', (fullCalendarViewHeight - 10) + 'px');
app.helper.showVerticalScroll(
widgetBody,
{
--
GitLab