extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Infolog: Fix "1 more..." incorrectly displayed on list link string

Browse Source
This commit is contained in:
nathan 2024-10-07 15:24:41 -06:00
parent 1c06e6864d
commit 685fbf7cbc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infolog/inc/class.infolog_ui.inc.php
View File

@ -240,7 +240,7 @@ class infolog_ui
} }
if(($show_links != 'none' && $show_links != 'no_describtion' || if(($show_links != 'none' && $show_links != 'no_describtion' ||
$this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) && $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
(isset($info['links']) || ($info['links'] = Link::get_links('infolog', $info['info_id'], $only_app, 'link_lastmod DESC', true, true, 20)))) (isset($info['links']) || ($info['links'] = Link::get_links('infolog', $info['info_id'], $only_app, 'link_lastmod DESC', true, true, $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))))
{ {
$info['filelinks']['total'] = $show_links == 'attach' ? count($info['links']) : Link::$row_count; $info['filelinks']['total'] = $show_links == 'attach' ? count($info['links']) : Link::$row_count;
$timesheets = array(); $timesheets = array();
@ -255,6 +255,7 @@ class infolog_ui
if($link['deleted']) if($link['deleted'])
{ {
$info['filelinks']['total']--;
continue; continue;
} // skip deleted links, but incl. them in row_mod! } // skip deleted links, but incl. them in row_mod!
@ -265,6 +266,10 @@ class infolog_ui
{ {
$info['filelinks'][] = $link; $info['filelinks'][] = $link;
} }
else
{
$info['filelinks']['total']--;
}
if (!$info['pm_id'] && $link['app'] == 'projectmanager') if (!$info['pm_id'] && $link['app'] == 'projectmanager')
{ {
$info['pm_id'] = $link['id']; $info['pm_id'] = $link['id'];