From 6efc361133c5160215bfbef7efbae603da312a1e Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 23 Dec 2020 14:28:44 +0800
Subject: [PATCH] * Finish task #8797.

---
 module/my/lang/zh-cn.php          | 2 +-
 module/my/lang/zh-tw.php          | 2 +-
 module/my/view/execution.html.php | 4 ++--
 module/user/model.php             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 6998606f61..5d12f08898 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -34,7 +34,7 @@ $lang->my->noTodo         = '暂时没有待办。';
 $lang->my->myExecutions = "我参与的阶段/冲刺/迭代";
 $lang->my->name         = '名称';
 $lang->my->code         = '代号';
-$lang->my->projects     = '项目';
+$lang->my->projects     = '所属项目';
 
 $lang->my->executionMenu = new stdclass();
 $lang->my->executionMenu->undone = '未结束';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 229d4593d4..0a788ca0b4 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -30,7 +30,7 @@ $lang->my->noTodo         = '暫時沒有待辦。';
 $lang->my->myExecutions = "我參與的階段/衝刺/迭代";
 $lang->my->name         = '名稱';
 $lang->my->code         = '代號';
-$lang->my->projects     = '項目';
+$lang->my->projects     = '所屬項目';
 
 $lang->my->taskMenu = new stdclass();
 $lang->my->taskMenu->assignedToMe = '指派給我';
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 0cc3151658..f7e863be47 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -16,8 +16,8 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo html::a(inlink('contribute', "mode=execution&type=undone"),  "<span class='text'>{$lang->my->executionMenu->undone}</span>" . ($type == 'undone' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'undone' ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink('contribute', "mode=execution&type=done"),  "<span class='text'>{$lang->my->executionMenu->done}</span>" . ($type == 'done' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'done' ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink('contribute', "mode=execution&type=undone&orderBy=id_desc&recTotal=0&recPerPage={$pager->recPerPage}"),  "<span class='text'>{$lang->my->executionMenu->undone}</span>" . ($type == 'undone' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'undone' ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink('contribute', "mode=execution&type=done&orderBy=id_desc&recTotal=0&recPerPage={$pager->recPerPage}"),  "<span class='text'>{$lang->my->executionMenu->done}</span>" . ($type == 'done' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'done' ? ' btn-active-text' : '') . "'");
     ?>
   </div>
 </div>
diff --git a/module/user/model.php b/module/user/model.php
index 7e4c6a7c61..555e5e68a6 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -958,7 +958,7 @@ class userModel extends model
      *
      * @param  string $account
      * @param  string $type
-     * @param  string $status all|undone|done
+     * @param  string $status
      * @access public
      * @return array
      */