From ce2d397cbc17859e68475a64044ba3abe1327911 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 1 Jun 2023 10:54:04 +0800 Subject: [PATCH] Convert `toBugs` of case to an array of objects. --- module/testcase/model.php | 4 ++-- module/testcase/view/edit.html.php | 6 +++--- module/testcase/view/view.html.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index 5e1d889d85..a5e481079c 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -497,8 +497,8 @@ class testcaseModel extends model if($case->fromBug) $case->fromBugTitle = $this->dao->findById($case->fromBug)->from(TABLE_BUG)->fields('title')->fetch('title'); $case->toBugs = array(); - $toBugs = $this->dao->select('id, title')->from(TABLE_BUG)->where('`case`')->eq($caseID)->fetchAll(); - foreach($toBugs as $toBug) $case->toBugs[$toBug->id] = $toBug->title; + $toBugs = $this->dao->select('id, title, severity, openedDate')->from(TABLE_BUG)->where('`case`')->eq($caseID)->fetchAll(); + foreach($toBugs as $toBug) $case->toBugs[$toBug->id] = $toBug; if($case->linkCase or $case->fromCaseID) $case->linkCaseTitles = $this->dao->select('id,title')->from(TABLE_CASE)->where('id')->in($case->linkCase)->orWhere('id')->eq($case->fromCaseID)->fetchPairs(); if($version == 0) $version = $case->version; diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index d1a095da57..842f257a06 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -293,11 +293,11 @@ toBugs)) { - foreach($case->toBugs as $bugID => $bugTitle) + foreach($case->toBugs as $bugID => $bug) { - echo "
  • "; + echo "
  • "; echo ""; - echo ""; + echo ""; echo '
  • '; } } diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index c0b17f31d1..0f6560e0fe 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -318,9 +318,9 @@ toBugs as $bugID => $bugTitle) + foreach($case->toBugs as $bugID => $bug) { - echo html::a($this->createLink('bug', 'view', "bugID=$bugID", '', true), "#$bugID " . $bugTitle, '', "class='iframe' data-width='80%' title='$bugTitle'") . '
    '; + echo html::a($this->createLink('bug', 'view', "bugID=$bugID", '', true), "#$bugID " . $bug->title, '', "class='iframe' data-width='80%' title='$bug->title'") . '
    '; } ?>