Merge branch 'master' into zenops_46

2022-09-30 15:07:37 +08:00
parent 6bed7509e7 05046906ea
commit 0afdc68654
81 changed files with 798 additions and 318 deletions
@@ -143,7 +143,11 @@
                <tr>
                  <td class='pd-0'><?php echo html::select("resolutions[$bugID]", $resolutionList, $bug->resolution, "class='form-control' onchange=setDuplicate(this.value,$bugID)");?></td>
                  <td class='pd-0 w-p50' id='<?php echo 'duplicateBugBox' . $bugID;?>' <?php if($bug->resolution != 'duplicate') echo "style='display:none'";?>>
-                    <?php echo html::select("duplicateBugs[$bugID]", $productBugList[$bug->product][$bug->branch], $bug->duplicateBug, "class='form-control' placeholder='{$lang->bug->duplicateTip}'");?>
+                    <?php
+                    $productBugs = $productBugList[$bug->product][$bug->branch];
+                    if(isset($productBugs[$bug->id])) unset($productBugs[$bug->id]);
+                    ?>
+                    <?php echo html::select("duplicateBugs[$bugID]", $productBugs, $bug->duplicateBug, "class='form-control' placeholder='{$lang->bug->duplicateTip}'");?>
                  </td>
                </tr>
              </table>