From 6aabc55d4d8b5ebd3255ce6e31995c528bfce7fa Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Thu, 20 Apr 2017 14:49:27 +0530
Subject: [PATCH] Fixes #470 - vt7 dev release - Recent Comments miss load more
---
layouts/v7/modules/Vtiger/RecentComments.tpl | 4 ++--
.../v7/modules/Vtiger/RelatedActivities.tpl | 4 ++--
modules/Vtiger/views/Detail.php | 1 +
packages/vtiger/optional/ModComments.zip | Bin 35375 -> 35381 bytes
.../modules/ModComments/models/Record.php | 1 +
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/RecentComments.tpl b/layouts/v7/modules/Vtiger/RecentComments.tpl
index c0f80373c..18b574ac2 100644
--- a/layouts/v7/modules/Vtiger/RecentComments.tpl
+++ b/layouts/v7/modules/Vtiger/RecentComments.tpl
@@ -205,8 +205,8 @@
{/if}
{if $PAGING_MODEL->isNextPageExists()}
<div class="row">
- <div class="pull-right">
- <a href="javascript:void(0)" class="moreRecentComments">{vtranslate('LBL_MORE',$MODULE_NAME)}..</a>
+ <div class="textAlignCenter">
+ <a href="javascript:void(0)" class="moreRecentComments">{vtranslate('LBL_SHOW_MORE',$MODULE_NAME)}</a>
</div>
</div>
{/if}
diff --git a/layouts/v7/modules/Vtiger/RelatedActivities.tpl b/layouts/v7/modules/Vtiger/RelatedActivities.tpl
index 6923b3371..b9c0bdb3b 100644
--- a/layouts/v7/modules/Vtiger/RelatedActivities.tpl
+++ b/layouts/v7/modules/Vtiger/RelatedActivities.tpl
@@ -130,8 +130,8 @@
{/if}
{if $PAGING_MODEL->isNextPageExists()}
<div class="row">
- <div class="pull-right">
- <a href="javascript:void(0)" class="moreRecentActivities" style="line-height: 0px;padding-right:30px;">{vtranslate('LBL_SHOW_MORE',$MODULE_NAME)}</a>
+ <div class="textAlignCenter">
+ <a href="javascript:void(0)" class="moreRecentActivities">{vtranslate('LBL_SHOW_MORE',$MODULE_NAME)}</a>
</div>
</div>
{/if}
diff --git a/modules/Vtiger/views/Detail.php b/modules/Vtiger/views/Detail.php
index d84912985..e7a4ec949 100644
--- a/modules/Vtiger/views/Detail.php
+++ b/modules/Vtiger/views/Detail.php
@@ -478,6 +478,7 @@ class Vtiger_Detail_View extends Vtiger_Index_View {
}
$pagingModel->calculatePageRange($recentComments);
+ array_pop($recentComments);
$modCommentsModel = Vtiger_Module_Model::getInstance('ModComments');
$fileNameFieldModel = Vtiger_Field::getInstance("filename", $modCommentsModel);
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index ca8f2eeef4ad0bc476360bca7df182e2497a3346..3c45a18e1e0aa973bc704f67f5b60055b754eae7 100644
GIT binary patch
delta 3049
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
delta 3062
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
E00jr<&Hw-a
diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/models/Record.php b/pkg/vtiger/modules/ModComments/modules/ModComments/models/Record.php
index 3e0664575..5278b2c8d 100644
--- a/pkg/vtiger/modules/ModComments/modules/ModComments/models/Record.php
+++ b/pkg/vtiger/modules/ModComments/modules/ModComments/models/Record.php
@@ -241,6 +241,7 @@ class ModComments_Record_Model extends Vtiger_Record_Model {
if($pagingModel){
$startIndex = $pagingModel->getStartIndex();
$limit = $pagingModel->getPageLimit();
+ $limit = $limit+1;
$query = $query . " LIMIT $startIndex, $limit";
}
--
GitLab