diff --git a/layouts/v7/modules/Vtiger/RecentComments.tpl b/layouts/v7/modules/Vtiger/RecentComments.tpl index c0f80373c4eb0330f2cea89085a3c48629fb2858..18b574ac227dbc399d5e44bcde84720ffb3e098e 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 6923b3371f6644fea5c9684b53ade753ef232c2e..b9c0bdb3b54745c30bea56963535bd045fe3fe19 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 d84912985707d6468e04f9ff2a21f4b253cb4392..e7a4ec94910b1183f0233d4e88f5ed6898126366 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 Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/models/Record.php b/pkg/vtiger/modules/ModComments/modules/ModComments/models/Record.php index 3e066457533fdd6c5ab344bcb63c0c7b98a1f6e3..5278b2c8d7d239d9c054f8c0aeb5b7c01042b35f 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"; }