From 4f0d8e7409d5bd57b66435a37c3dee4fd57460ac Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 5 Jul 2018 13:20:14 +0800
Subject: [PATCH 1/2]  * Finish task #4508.

---
 module/doc/model.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index dc2d1e0045..f0a9d705b4 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -48,7 +48,7 @@ class docModel extends model
 
             $selectHtml .= "<div class='btn-group angle-btn'>";
             $selectHtml .= "<div class='btn-group'>";
-            $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $mainLib . " <span class='caret'></span></a>";
+            $selectHtml .= "<a data-toggle='dropdown' class='btn btn-limit' title=$mainLib>" . $mainLib . " <span class='caret'></span></a>";
             $selectHtml .= "<ul class='dropdown-menu'>";
             foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
             {
@@ -68,12 +68,13 @@ class docModel extends model
                 if($type == 'project') $currentLib = $projectID;
                 if($currentLib)
                 {
-                    $allLibGroups = $this->getAllLibGroups();
-                    $currentGroups = $allLibGroups[$type];
+                    $allLibGroups   = $this->getAllLibGroups();
+                    $currentGroups  = $allLibGroups[$type];
+                    $currentLibName = is_array($currentGroups[$currentLib]) ? $currentGroups[$currentLib]['name'] : $currentGroups[$currentLib];
 
                     $selectHtml .= "<div class='btn-group angle-btn'>";
                     $selectHtml .= "<div class='btn-group'>";
-                    $selectHtml .= '<a data-toggle="dropdown" class="btn">' . (is_array($currentGroups[$currentLib]) ? $currentGroups[$currentLib]['name'] : $currentGroups[$currentLib]) . ' <span class="caret"></span></a>';
+                    $selectHtml .= "<a data-toggle='dropdown' class='btn btn-limit' title=$currentLibName>" . $currentLibName . ' <span class="caret"></span></a>';
                     $selectHtml .='<ul class="dropdown-menu">';
                     if($type == 'custom')
                     {

From 6e71477c5c7271b770d75de86b5dc1dcdbf85ee0 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 5 Jul 2018 13:35:09 +0800
Subject: [PATCH 2/2]  * Unset todos those finished by me.

---
 module/block/control.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 1b2882e97a..4b34c27c33 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1237,14 +1237,19 @@ class block extends control
             $this->app->loadLang('todo');
             $stmt = $this->dao->select('*')->from(TABLE_TODO)
                 ->where("(assignedTo = '{$this->app->user->account}' or (assignedTo = '' and account='{$this->app->user->account}'))")
-                ->andWhere('status')->ne('done')
                 ->andWhere('cycle')->eq(0)
                 ->orderBy('`date`');
             if(isset($params->todoNum)) $stmt->limit($params->todoNum);
             $todos = $stmt->fetchAll();
 
-            foreach($todos as $todo)
+            foreach($todos as $key => $todo)
             {
+                if($todo->status == 'done' and $todo->finishedBy == $this->app->user->account)
+                {
+                    unset($todos[$key]);
+                    continue;
+                }
+
                 $todo->begin = date::formatTime($todo->begin);
                 $todo->end   = date::formatTime($todo->end);
             }