From 8978a457cac1d0bb0e11e2c50b61fc8a98196fe4 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Wed, 21 Jun 2017 15:54:14 +0530
Subject: [PATCH] Fixes #560 - Merge Selected Records Error
---
layouts/v7/modules/Vtiger/resources/MergeRecords.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/layouts/v7/modules/Vtiger/resources/MergeRecords.js b/layouts/v7/modules/Vtiger/resources/MergeRecords.js
index 73be3720d..660f0bf27 100644
--- a/layouts/v7/modules/Vtiger/resources/MergeRecords.js
+++ b/layouts/v7/modules/Vtiger/resources/MergeRecords.js
@@ -50,8 +50,11 @@ Vtiger.Class('Vtiger_MergeRecords_Js',{},{
// Adding Scroll
var offset = container.find('.modal-body .datacontent').offset();
var viewPortHeight = $(window).height()-60;
+ if (offset) {
+ viewPortHeight = (viewPortHeight-offset['top']);
+ }
var params = {
- setHeight:(viewPortHeight-offset['top'])+'px'
+ setHeight:viewPortHeight+'px'
};
app.helper.showVerticalScroll(container.find('.modal-body .datacontent'), params);
--
GitLab