diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 583f2f8694..7312dd55f6 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -157,8 +157,8 @@ $lang->bug->confirmDeleteTemplate = '您确认要删除该模板吗？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步骤]</p>";
-$lang->bug->tplResult = "</br><p>[结果]</p>";
-$lang->bug->tplExpect = "</br><p>[期望]</p>";
+$lang->bug->tplResult = "<p>[结果]</p>";
+$lang->bug->tplExpect = "<p>[期望]</p>";
 
 /* 各个字段取值列表。*/
 $lang->bug->severityList[3] = '3';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 9a5246988a..321d7c26d1 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -157,8 +157,8 @@ $lang->bug->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步驟]</p>";
-$lang->bug->tplResult = "</br><p>[結果]</p>";
-$lang->bug->tplExpect = "</br><p>[期望]</p>";
+$lang->bug->tplResult = "<p>[結果]</p>";
+$lang->bug->tplExpect = "<p>[期望]</p>";
 
 /* 各個欄位取值列表。*/
 $lang->bug->severityList[3] = '3';
diff --git a/module/dev/model.php b/module/dev/model.php
index 7bbdd1ab47..f4049a8f0a 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -16,7 +16,7 @@ class devModel extends model
         foreach($datatables as $table)
         {
             $table = current($table);
-            if(strpos($table, $this->config->db->prefix) !== false)
+            if(empty($this->config->db->prefix) or strpos($table, $this->config->db->prefix) !== false)
             {
                 $subTable = substr($table, strpos($table, '_') + 1);
                 $group    = zget($this->config->dev->group, $subTable, 'other');
diff --git a/module/todo/control.php b/module/todo/control.php
index cbcf79e152..0bfcf8527f 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -333,6 +333,7 @@ class todo extends control
         $this->view->actions    = $this->loadModel('action')->getList('todo', $todoID);
         $this->view->from       = $from;
         $this->view->projects   = $this->loadModel('project')->getPairs();
+        $this->view->products   = $this->loadModel('product')->getPairs();
 
         $this->display();
     }
diff --git a/module/todo/js/view.js b/module/todo/js/view.js
index d770f94475..a51ea6e595 100644
--- a/module/todo/js/view.js
+++ b/module/todo/js/view.js
@@ -1,5 +1,17 @@
 $(function()
 {
+    $('#toStoryLink').click(function()
+    {
+        $('#productModal .modal-body .input-group .input-group-btn').addClass('hidden');
+        $('#productModal #toStoryButton').closest('.input-group-btn').removeClass('hidden');
+    })
+
+    $('#toBugLink').click(function()
+    {
+        $('#productModal .modal-body .input-group .input-group-btn').addClass('hidden');
+        $('#productModal #toBugButton').closest('.input-group-btn').removeClass('hidden');
+    })
+
     $('#toTaskButton').click(function()
     {
         var onlybody    = config.onlybody;
@@ -10,6 +22,29 @@ $(function()
 
         config.onlybody      = onlybody;
         parent.location.href = link;
+    })
 
+    $('#toStoryButton').click(function()
+    {
+        var onlybody    = config.onlybody;
+        config.onlybody = 'no';
+
+        var productID = $(this).closest('.input-group').find('#product').val();
+        var link      = createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&projectID=0&bugID=0&planID=0&todoID=' + todoID);
+
+        config.onlybody      = onlybody;
+        parent.location.href = link;
+    })
+
+    $('#toBugButton').click(function()
+    {
+        var onlybody    = config.onlybody;
+        config.onlybody = 'no';
+
+        var productID = $(this).closest('.input-group').find('#product').val();
+        var link      = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID);
+
+        config.onlybody      = onlybody;
+        parent.location.href = link;
     })
 });
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index bccd6a4b64..019111ad7d 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -56,7 +56,7 @@
             </tr>
             <tr>
               <th class='w-80px'><?php echo $lang->todo->account;?></th>
-              <td><?php echo $todo->account;?></td>
+              <td><?php echo zget($users, $todo->account);?></td>
             </tr>
             <tr>
               <th class='w-80px'><?php echo $lang->todo->date;?></th>
@@ -143,9 +143,9 @@
             unset($_GET['onlybody']);
             echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
             echo "<ul class='dropdown-menu pull-right' role='menu'>";
-            if($createStoryPriv) echo '<li>' . html::a($this->createLink('story', 'create', "productID=0&branch=0&moduleID=0&storyID=0&projectID=0&bugID=0&planID=0&todoID={$todo->id}"), $lang->todo->reasonList['story'], '_parent') . '</li>';
-            if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-moveable='true' data-position='193px'") . '</li>';
-            if($createBugPriv)   echo '<li>' . html::a($this->createLink('bug', 'create', "productID=0&branch=0&extras=todoID={$todo->id}"), $lang->todo->reasonList['bug'], '_parent') . '</li>';
+            if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-moveable='true' data-position='193px' id='toStoryLink'") . '</li>';
+            if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-moveable='true' data-position='193px' id='toTaskLink'") . '</li>';
+            if($createBugPriv)   echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#productModal' data-moveable='true' data-position='193px' id='toBugLink'") . '</li>';
             echo "</ul>";
             if($isonlybody) $_GET['onlybody'] = 'yes';
         }
@@ -179,6 +179,23 @@
     </div>
   </div>
 </div>
+<div class="modal fade" id="productModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h4 class="modal-title"><i class="icon-file-text"></i> <?php echo $lang->product->select;?></h4>
+      </div>
+      <div class="modal-body">
+        <div class='input-group'>
+          <?php echo html::select('product', $products, '', "class='form-control chosen'");?>
+          <span class='input-group-btn'><?php echo html::commonButton($lang->todo->reasonList['story'], "id='toStoryButton'");?></span>
+          <span class='input-group-btn'><?php echo html::commonButton($lang->todo->reasonList['bug'], "id='toBugButton'");?></span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 <?php js::set('todoID', $todo->id);?>
 <?php else:?>
 <?php echo $lang->todo->thisIsPrivate;?>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 7ae9a15e65..dff96be3c1 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -15,7 +15,16 @@ function createLink(moduleName, methodName, vars, viewType, isOnlyBody)
     if(vars)
     {
         vars = vars.split('&');
-        for(i = 0; i < vars.length; i ++) vars[i] = vars[i].split('=');
+        for(i = 0; i < vars.length; i ++)
+        {
+            splited = vars[i].split('=');
+
+            var newvars = new Array()
+            newvars[0] = splited.shift();
+            newvars[1] = splited.join('=');
+
+            vars[i] = newvars;
+        }
     }
     if(config.requestType != 'GET')
     {