From 3e312e6ce0863c7ccd91ee13312e33290deabb82 Mon Sep 17 00:00:00 2001
From: zhaixiaojian <zhaixiaojian@easycorp.ltd>
Date: Wed, 14 Aug 2024 22:23:10 +0800
Subject: [PATCH] + [task#125051,done,0.1h,0h] Adjust code.

---
 module/repo/control.php     | 15 ++++++++-------
 module/repo/ui/log.html.php |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/module/repo/control.php b/module/repo/control.php
index 6c966e3464..43ad34036c 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -584,23 +584,24 @@ class repo extends control
         $logs  = $this->repo->getCommits($repo, $entry, $branchID, 'dir', $pager, '', '', $query);
 
         $revisionIds = array_column($logs, 'revision');
-        $stories     = $this->loadModel('story')->getLinkedCommits($repoID, $revisionIds);
-        $designs     = $this->loadModel('design')->getLinkedCommits($repoID, $revisionIds);
-        $tasks       = $this->loadModel('task')->getLinkedCommits($repoID, $revisionIds);
-        $bugs        = $this->loadModel('bug')->getLinkedCommits($repoID, $revisionIds);
+        $modelCommits = new stdClass();
+        $modelCommits->stories = $this->loadModel('story')->getLinkedCommits($repoID, $revisionIds);
+        $modelCommits->designs = $this->loadModel('design')->getLinkedCommits($repoID, $revisionIds);
+        $modelCommits->tasks   = $this->loadModel('task')->getLinkedCommits($repoID, $revisionIds);
+        $modelCommits->bugs    = $this->loadModel('bug')->getLinkedCommits($repoID, $revisionIds);
         /* Set tips and buttons for different relations. */
         foreach($logs as $logItem)
         {
             $logItem->relationFieldTips = '';
             foreach(array('designs' => 'design', 'stroies' => 'story', 'tasks' => 'task' , 'bugs' => 'bug') as $fieldType=>$moduleName)
             {
-                if(!empty(${$fieldType}[$logItem->revision]))
+                if(!empty($modelCommits->{$fieldType}[$logItem->revision]))
                 {
-                    $fieldCommits = ${$fieldType}[$logItem->revision];
+                    $fieldCommits = $modelCommits->{$fieldType}[$logItem->revision];
                     $logItem->relationFieldTips .= ' ' . $this->lang->repo->{$moduleName};
                     foreach($fieldCommits as $item) $item->url = !empty($item->id) ? $this->createLink($moduleName, 'view', "{$moduleName}ID=" . $item->id) : '';
                     $logItem->relationFieldTips .= ' #'.implode(' #', array_column($fieldCommits, 'id'));
-                    $logItem->relationField[$fieldType] = ${$fieldType}[$logItem->revision];
+                    $logItem->relationField[$fieldType] = $fieldCommits;
                 }
             }
         }
diff --git a/module/repo/ui/log.html.php b/module/repo/ui/log.html.php
index adf51073b7..e51abeffcf 100644
--- a/module/repo/ui/log.html.php
+++ b/module/repo/ui/log.html.php
@@ -60,7 +60,8 @@ foreach($logs as $log)
         if (!empty($log->relationField[$key]))
         {
             $log->relations .= html::commonButton($lang->repo->{$value}, '', 'btn size-sm mx-2');
-            foreach ($log->relationField[$key] as $item) {
+            foreach ($log->relationField[$key] as $item)
+            {
                 $log->relations .= html::a($item->url, '#' . $item->id);
             }
         }