From 4b5af89b3258332ecbc032514de6e3ceb6b66fbe Mon Sep 17 00:00:00 2001 From: zhaixiaojian Date: Tue, 13 Aug 2024 15:28:12 +0800 Subject: [PATCH] * [task#125055,done,0.1h,0h] format code. --- module/repo/control.php | 8 +++++--- module/repo/model.php | 18 ++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/module/repo/control.php b/module/repo/control.php index d63d54185a..3c64c8628b 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -1988,12 +1988,14 @@ class repo extends control public function ajaxGetBranchCommits(int $repoID, string $branchID) { $repo = $this->repo->getByID($repoID); - $branchID = helper::safe64Encode(base64_encode($branchID)); + $branchID = helper::safe64Encode(base64_encode($branchID)); $pageSize = 10; + $this->app->loadClass('pager', true); - $pager = new pager(0, $pageSize, 1); + $pager = new pager(0, $pageSize, 1); $pager->recPerPage = $pageSize; - $commits = $this->repo->getCommits($repo, "", $branchID, 'dir', $pager, '', '', null); + $commits = $this->repo->getCommits($repo, '', $branchID, 'dir', $pager, '', '', null); + $retCommits = array(); if(!empty($commits)) { diff --git a/module/repo/model.php b/module/repo/model.php index 05ccdc72cf..5d8c7d23ef 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -1895,17 +1895,15 @@ class repoModel extends model ->where('revision')->in([$log->revision]) ->andWhere('repo')->eq($repo->id) ->fetchPairs('id'); - if(!empty($objects['stories'])) + foreach (array('stories'=>'story', 'tasks'=>'task', 'bugs'=>'bug') as $objectType=>$modelType) { - foreach($objects['stories'] as $storyID) $this->loadModel('story')->updateLinkedCommits((int)$storyID, $repo->id, $revisions); - } - if(!empty($objects['tasks'])) - { - foreach($objects['tasks'] as $taskID) $this->loadModel('task')->updateLinkedCommits((int)$taskID, $repo->id, $revisions); - } - if(!empty($objects['bugs'])) - { - foreach($objects['bugs'] as $bugID) $this->loadModel('bug')->updateLinkedCommits((int)$bugID, $repo->id, $revisions); + if(!empty($objects[$objectType])) + { + foreach($objects[$objectType] as $modelID) + { + $this->loadModel($modelType)->updateLinkedCommits((int)$modelID, $repo->id, $revisions); + } + } } } }