diff --git a/module/common/control.php b/module/common/control.php
index 42f497a51f..ca4417d5c6 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -366,12 +366,15 @@ EOT;
     /* 比较两个数组元素的不同，产生修改记录。*/
     public static function createChanges($old, $new)
     {
+        global $config;
         $changes = array();
         foreach($new as $key => $value)
         {
             if(strtolower($key) == 'lastediteddate') continue;
             if(strtolower($key) == 'lasteditedby')   continue;
-            if($new->$key != $old->$key)
+
+            if(isset($config->db->stripSlash) and $config->db->stripSlash) $value = stripslashes($value);
+            if($value != $old->$key)
             { 
                 $diff = '';
                 if(substr_count($value, "\n") > 1 or substr_count($old->$key, "\n") > 1) $diff = self::diff($old->$key, $value);
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index a2a6679e73..2a1c56e3a7 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -55,6 +55,7 @@ $lang->resource->my->editProfile = 'editProfile';
 
 $lang->resource->todo->create    = 'create';
 $lang->resource->todo->edit      = 'edit';
+$lang->resource->todo->view      = 'view';
 $lang->resource->todo->delete    = 'delete';
 $lang->resource->todo->mark      = 'mark';
 $lang->resource->todo->import2Today = 'import2Today';
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index b0a6f8fdd3..8abe825cbf 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -40,7 +40,7 @@ function changeDate(date)
        echo '<span id="thisweek">' . html::a($this->createLink('my', 'todo', "date=thisweek"),  $lang->todo->thisWeekTodos) . '</span>';
        echo '<span id="lastweek">' . html::a($this->createLink('my', 'todo', "date=lastweek"),  $lang->todo->lastWeekTodos) . '</span>';
        echo '<span id="all">'      . html::a($this->createLink('my', 'todo', "date=all"),       $lang->todo->allDaysTodos)  . '</span>';
-       echo '<span id="before">'   . html::a($this->createLink('my', 'todo', "date=before&account={$app->user->account}&status=wait,doing"), $lang->todo->allUndone) . '</span>';
+       echo '<span id="before">'   . html::a($this->createLink('my', 'todo', "date=before&account={$app->user->account}&status=undone"), $lang->todo->allUndone) . '</span>';
        echo "<span id='$date'>"    . html::select('date', $dates, $date, 'onchange=changeDate(this.value)') . '</span>';
        ?>
        <script>$('#<?php echo $type;?>').addClass('active')</script>
@@ -86,7 +86,7 @@ function changeDate(date)
       </td>
       <td><?php echo $todo->begin;?></td>
       <td><?php echo $todo->end;?></td>
-      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList->{$todo->status};?></td>
+      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
       <td>
         <?php 
         echo html::a($this->createLink('todo', 'mark',   "id=$todo->id&status=$todo->status"), $lang->todo->{'mark'.ucfirst($todo->status)}, 'hiddenwin');
diff --git a/module/todo/control.php b/module/todo/control.php
index 3f872f2c79..90e239e006 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -81,6 +81,22 @@ class todo extends control
         $this->display();
     }
 
+    /* 鏌ョ湅todo銆�*/
+    public function view($todoID)
+    {
+        $todo = $this->todo->findById($todoID);
+        $this->lang->todo->menu = $this->lang->user->menu;
+        $this->loadModel('user')->setMenu($this->user->getPairs(), $todo->account);
+        $this->lang->set('menugroup.todo', 'company');
+
+        $this->view->header->title = $this->lang->todo->view;
+        $this->view->position[]    = $this->lang->todo->view;
+        $this->view->todo          = $todo;
+        $this->view->times         = $this->todo->buildTimeList();
+
+        $this->display();
+    }
+
     /* 鍒犻櫎涓�涓猼odo銆�*/
     public function delete($todoID, $confirm = 'no')
     {
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 09b748c47d..7a08b4d6ae 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -25,6 +25,7 @@ $lang->todo->common    = 'TODO';
 $lang->todo->index     = "todo涓�瑙�";
 $lang->todo->create    = "鏂板TODO";
 $lang->todo->edit      = "鏇存柊";
+$lang->todo->view      = "TODO璇︽儏";
 $lang->todo->markDone  = "鏈畬鎴�";
 $lang->todo->markWait  = "宸插畬鎴�";
 $lang->todo->markDoing = "宸插畬鎴�";
@@ -32,6 +33,7 @@ $lang->todo->mark      = "鏇存敼鐘舵��";
 $lang->todo->delete    = "鍒犻櫎";
 $lang->todo->browse    = "娴忚TODO";
 $lang->todo->import2Today = "瀵煎叆鍒颁粖澶�";
+$lang->todo->changeStatus = "鏇存敼";
 
 $lang->todo->id          = '缂栧彿';
 $lang->todo->date        = '鏃ユ湡';
@@ -49,9 +51,12 @@ $lang->todo->week  = '鏄熸湡';
 $lang->todo->today = '浠婂ぉ';
 $lang->todo->weekDateList = '涓�,浜�,涓�,鍥�,浜�,鍏�,澶�';
 
-$lang->todo->statusList->wait  = '鏈紑濮�';
-$lang->todo->statusList->doing = '杩涜涓�';
-$lang->todo->statusList->done  = '宸插畬鎴�';
+$lang->todo->statusList['']         = '';
+$lang->todo->statusList['wait']     = '鏈紑濮�';
+$lang->todo->statusList['doing']    = '杩涜涓�';
+$lang->todo->statusList['done']     = '宸插畬鎴�';
+//$lang->todo->statusList['cancel']   = '宸插彇娑�';
+//$lang->todo->statusList['postpone'] = '宸插欢鏈�';
 
 $lang->todo->priList[3] = '涓�鑸�';
 $lang->todo->priList[1] = '鏈�楂�';
diff --git a/module/todo/model.php b/module/todo/model.php
index 3d72fc2a17..49d0c5a46d 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -116,13 +116,13 @@ class todoModel extends model
         }
 
         if($account == '')   $account = $this->app->user->account;
-        if($status  == 'all') $status = 'wait,doing,done';
 
         $stmt = $this->dao->select('*')->from(TABLE_TODO)
             ->where('account')->eq($account)
             ->andWhere("date >= '$begin'")
             ->andWhere("date <= '$end'")
-            ->andWhere('status')->in($status)
+            ->onCaseOf($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->endCase()
+            ->onCaseOf($status == 'undone')->andWhere('status')->ne('done')->endCase()
             ->orderBy('date, status, begin')
             ->query();
         while($todo = $stmt->fetch())
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index daa585cd88..5cbcee4403 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -68,10 +68,10 @@ function changeDate(date)
       <td><?php echo $todo->date;?></td>
       <td><?php echo $lang->todo->typeList->{$todo->type};?></td>
       <td><?php echo $todo->pri;?></td>
-      <td class='a-left'><?php echo $todo->name;?></td>
+      <td class='a-left'><?php if(!common::printLink('todo', 'view', "todo=$todo->id", $todo->name)) echo $todo->name;?></td>
       <td><?php echo $todo->begin;?></td>
       <td><?php echo $todo->end;?></td>
-      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList->{$todo->status};?></td>
+      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
     </tr>
     <?php endforeach;?>
     </tbody>