From 8e2ba0762edd29599b2ffd620ae4ef02a3fbf1a4 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 24 Dec 2020 09:49:27 +0800
Subject: [PATCH] * Fix bug.

---
 module/block/view/todoblock.html.php | 18 +++++++++---------
 module/testtask/model.php            |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index ef86a5e7cc..a438b40e4e 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -40,15 +40,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
       <div class="todo-form-trigger"><input type="text" placeholder="<?php echo $lang->todo->lblClickCreate?>" autocomplete="off" class="form-control"></div>
       <form class="form-horizontal todoes-form layer" method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'create', 'date=today&userID=&from=block');?>'>
         <h3><?php echo $lang->todo->create;?></h3>
-        <div class="form-group">
-          <?php $leftWidth  = common::checkNotCN() ? 'col-sm-3' : 'col-sm-2';?>
-          <label for="todoName" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->name?></label>
-          <div class="col-sm-9 required"><input type="text" class="form-control" autocomplete="off" name="name"></div>
-        </div>
-        <div class="form-group">
-          <label for="todoPri" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->pri?></label>
-          <div class="col-sm-4"><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen'");?></div>
-        </div>
+        <?php $leftWidth  = common::checkNotCN() ? 'col-sm-3' : 'col-sm-2';?>
         <div class="form-group">
           <label for="todoDate" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->date?></label>
           <div class="col-sm-9">
@@ -58,6 +50,14 @@ if(!$selfCall) die(include('./todolist.html.php'));
             </div>
           </div>
         </div>
+        <div class="form-group">
+          <label for="todoPri" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->pri?></label>
+          <div class="col-sm-4"><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen'");?></div>
+        </div>
+        <div class="form-group">
+          <label for="todoName" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->name?></label>
+          <div class="col-sm-9 required"><input type="text" class="form-control" autocomplete="off" name="name"></div>
+        </div>
         <div class="form-group">
           <label for="todoBegin" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->beginAndEnd?></label>
           <div class="col-sm-4">
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 2102c1d8fa..aafe4a3e82 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -365,7 +365,7 @@ class testtaskModel extends model
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.auto')->ne('unit')
             ->andWhere('t1.owner')->eq($account)
-            ->andWhere('t2.id')->in($this->app->user->view->projects)
+            ->andWhere('t2.id')->in($this->app->user->view->sprints)
             ->beginIF($type == 'wait')->andWhere('t1.status')->ne('done')->fi()
             ->beginIF($type == 'done')->andWhere('t1.status')->eq('done')->fi()
             ->orderBy($orderBy)