From 0d16a79b6351a9a070282c85bbf05c520e255699 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Tue, 15 Feb 2022 08:22:25 +0800 Subject: [PATCH 1/2] * Fix bug #19323. --- module/kanban/control.php | 2 ++ module/kanban/view/space.html.php | 4 ++-- module/kanban/view/viewarchivedcard.html.php | 2 +- module/my/js/profile.js | 2 +- module/my/view/profile.html.php | 2 +- module/program/control.php | 1 + module/program/view/browsebylist.html.php | 2 +- module/project/control.php | 8 +++++--- module/project/view/browsebycard.html.php | 4 ++-- module/project/view/index.html.php | 4 ++-- module/user/model.php | 13 ++++++++++--- 11 files changed, 28 insertions(+), 16 deletions(-) diff --git a/module/kanban/control.php b/module/kanban/control.php index 653f208362..3bdfa62371 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -33,6 +33,7 @@ class kanban extends control $this->view->browseType = $browseType; $this->view->pager = $pager; $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted'); + $this->view->userIdPairs = $this->user->getPairs('noletter|nodeleted|showid'); $this->view->usersAvatar = $this->user->getAvatarPairs(); $this->display(); @@ -1299,6 +1300,7 @@ class kanban extends control { $this->view->cards = $this->kanban->getCardsByObject('region', $regionID, 1); $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted'); + $this->view->userIdPairs = $this->user->getPairs('noletter|nodeleted|showid'); $this->view->usersAvatar = $this->user->getAvatarPairs(); $this->display(); diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index 864755aacf..761d4f57c2 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -127,13 +127,13 @@ $count ++; ?>
- $usersAvatar[$member], 'account' => $member)); ?> + $usersAvatar[$member], 'account' => $member), 'avatar-circle avatar-' . zget($userIdPairs, $member)); ?>
3):?> 4) echo '…';?>
- $usersAvatar[end($teamPairs)], 'account' => end($teamPairs))); ?> + $usersAvatar[end($teamPairs)], 'account' => end($teamPairs)), 'avatar-circle avatar-' . zget($userIdPairs, end($teamPairs))); ?>
diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index 654840a469..13eb50a1d7 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -109,7 +109,7 @@ foreach($assignedToList as $account) { if($count > 2) continue; - echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account)); + echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account), 'avatar-circle avatar-' . zget($userIdPairs, $account)); $count ++; } ?> diff --git a/module/my/js/profile.js b/module/my/js/profile.js index dc3977efc7..e5cd75e0b4 100644 --- a/module/my/js/profile.js +++ b/module/my/js/profile.js @@ -14,7 +14,7 @@ $(document).ready(function() { window.parent.$('#userNav .avatar, #menu-avatar').html(''); window.parent.$('#mainContent>.cell>.main-header>.avatar').html(''); - window.parent.$('#mainContent .avatar-' + account).html(''); + window.parent.$('#mainContent .avatar-' + userID).html(''); } $('#avatarUploadBtn').tooltip(); diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index 8ffeb53c48..d36fd514be 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -12,7 +12,7 @@ ?> app->user->avatar);?> -app->user->account);?> +app->user->id);?>
diff --git a/module/program/control.php b/module/program/control.php index f8dfbac729..f9c9f0a5bb 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -59,6 +59,7 @@ class program extends control $this->view->status = $status; $this->view->orderBy = $orderBy; $this->view->users = $this->user->getPairs('noletter'); + $this->view->userIdPairs = $this->user->getPairs('noletter|showid'); $this->view->usersAvatar = $this->user->getAvatarPairs(); $this->view->programType = $programType; $this->view->PMList = $PMList; diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 51d684638e..b2e464e598 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -66,7 +66,7 @@ project->statusList, $program->status, '');?> PM)):?> - $usersAvatar[$program->PM], 'account' => $program->PM)); ?> + $usersAvatar[$program->PM], 'account' => $program->PM), 'avatar-circle avatar-' . zget($userIdPairs, $program->PM)); ?> PM]) ? $PMList[$program->PM]->id : '';?> PM);?> createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");?> diff --git a/module/project/control.php b/module/project/control.php index 1986643fb0..d2f812210c 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -262,9 +262,10 @@ class project extends control $this->view->executionActions = $executionActions; } - $this->view->title = $this->lang->project->common . $this->lang->colon . $this->lang->project->index; - $this->view->position[] = $this->lang->project->index; - $this->view->project = $project; + $this->view->title = $this->lang->project->common . $this->lang->colon . $this->lang->project->index; + $this->view->position[] = $this->lang->project->index; + $this->view->project = $project; + $this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid'); $this->display(); } @@ -308,6 +309,7 @@ class project extends control $this->view->programTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list'); $this->view->programs = array('0' => '') + $this->program->getParentPairs(); $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted'); + $this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid'); $this->view->usersAvatar = $this->user->getAvatarPairs(); $this->view->browseType = $browseType; $this->view->projectType = $projectType; diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php index 04a708ee67..7621e4b93c 100644 --- a/module/project/view/browsebycard.html.php +++ b/module/project/view/browsebycard.html.php @@ -155,13 +155,13 @@ $count ++; ?> ' title=""> - $usersAvatar[$member], 'account' => $member)); ?> + $usersAvatar[$member], 'account' => $member), 'avatar-circle avatar-' . zget($userIdPairs, $member)); ?> teamCount > 3):?> teamCount > 4) echo '…';?> ' title=""> - $usersAvatar[end($project->teamMembers)], 'account' => $member)); ?> + $usersAvatar[end($project->teamMembers)], 'account' => $member), 'avatar-circle avatar-' . zget($userIdPairs, $member)); ?>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index 472270fd5b..b5795cb466 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -93,7 +93,7 @@ 2) break;?>
- $usersAvatar[$member->account], 'account' => $member->account)); ?> + $usersAvatar[$member->account], 'account' => $member->account), 'avatar-circle avatar-' . zget($userIdPairs, $member->account)); ?>
4):?> @@ -102,7 +102,7 @@ 3):?>
- $usersAvatar[$lastMember->account], 'account' => $lastMember->account)); ?> + $usersAvatar[$lastMember->account], 'account' => $lastMember->account), 'avatar-circle avatar-' . zget($userIdPairs, $lastMember->account)); ?>
diff --git a/module/user/model.php b/module/user/model.php index 048fa01edf..258f82e66b 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -119,9 +119,16 @@ class userModel extends model /* Cycle the user records to append the first letter of his account. */ foreach($users as $account => $user) { - $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':'; - if(strpos($params, 'noletter') !== false or !empty($this->config->isINT)) $firstLetter = ''; - $users[$account] = $firstLetter . (($user->deleted and strpos($params, 'realname') === false) ? $user->account : ($user->realname ? $user->realname : $user->account)); + if(strpos($params, 'showid') !== false) + { + $users[$account] = $user->id; + } + else + { + $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':'; + if(strpos($params, 'noletter') !== false or !empty($this->config->isINT)) $firstLetter = ''; + $users[$account] = $firstLetter . (($user->deleted and strpos($params, 'realname') === false) ? $user->account : ($user->realname ? $user->realname : $user->account)); + } } /* Append empty, closed, and guest users. */ From 7c3c7d1662e7ae71c675d93e0f6322edcc253fb5 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Tue, 15 Feb 2022 08:26:50 +0800 Subject: [PATCH 2/2] * Fix bug #19383. --- module/gitlab/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/gitlab/model.php b/module/gitlab/model.php index f7699c0219..2d0b2cf86f 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -625,7 +625,7 @@ class gitlabModel extends model $results = json_decode(commonModel::http($url . "&statistics=true&order_by={$order}&sort={$sort}&page={$page}&per_page=100&all_available=true")); if(!is_array($results)) break; if(!empty($results)) $allResults = array_merge($allResults, $results); - if(count($results) < 100 or $page > 10) break; + if(count($results) < 100) break; } return $allResults; @@ -701,7 +701,7 @@ class gitlabModel extends model $results = json_decode(commonModel::http($url . "&simple={$simple}&page={$page}&per_page=100")); if(!is_array($results)) break; if(!empty($results)) $allResults = array_merge($allResults, $results); - if(count($results) < 100 or $page > 10) break; + if(count($results) < 100) break; } return $allResults;