diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 7d91651a3d..5e7fc3a86d 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -166,7 +166,7 @@ $lang->project->statusSelects['doing']        = 'Doing';
 $lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
 $lang->project->statusSelects['done']         = 'Done';
 $lang->project->statusSelects['closed']       = 'Closed';
-$lang->project->statusSelects['cancel']    :   = 'Canceled';
+$lang->project->statusSelects['cancel']       = 'Canceled';
 
 $lang->project->groups['']           = 'Group';
 $lang->project->groups['story']      = 'By Story';
diff --git a/module/todo/control.php b/module/todo/control.php
index ace512444d..0c467e89c2 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -42,15 +42,7 @@ class todo extends control
         {
             $todoID = $this->todo->create($date, $account);
             if(dao::isError()) die(js::error(dao::getError()));
-
-            if($_POST['type'] != 'feedback')
-            {
-                $this->loadModel('action')->create('todo', $todoID, 'opened');
-            }
-            else
-            {
-                $this->loadModel('action')->create('todo', $todoID, 'FromFeedback', '', $_POST['idvalue']);
-            }
+            $this->loadModel('action')->create('todo', $todoID, 'opened');
 
             $date = str_replace('-', '', $this->post->date);
             if($date == '')
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 5b7dce378e..8161f23e43 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle']    = 'Recur';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = $lang->projectCommon . 'Task';
 $lang->todo->typeList['story']    = $lang->projectCommon . 'Story';
-$lang->todo->typeList['feedback'] = 'Feedback';
 
 global $config;
 if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 592f333c08..f8674cbfc2 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = $lang->projectCommon . '任务';
 $lang->todo->typeList['story']    = $lang->projectCommon . '需求';
-$lang->todo->typeList['feedback'] = '反馈';
 
 global $config;
 if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 55183b173a..fb0855355f 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -96,12 +96,12 @@
           <th><?php echo $lang->todo->name;?></th>
           <td colspan='2'>
             <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control'");?></div>
-            <div class='nameBox required'><?php echo html::input('name', '', "class='form-control'");?></div>
+            <div class='nameBox required'><?php echo html::input('name', isset($name) ? $name : '', "class='form-control'");?></div>
           </td>
         </tr>  
         <tr>
           <th><?php echo $lang->todo->desc;?></th>
-          <td colspan='2'><?php echo html::textarea('desc', isset($feedback->desc) ? $feedback->desc : '', "rows='8' class='form-control'");?></td>
+          <td colspan='2'><?php echo html::textarea('desc', isset($desc) ? $desc : '', "rows='8' class='form-control'");?></td>
         </tr>  
         <tr>
           <th><?php echo $lang->todo->status;?></th>