diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index 3e258bd9be..621cc197f5 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -75,7 +75,7 @@ function setTemplate(templateID)
 function deleteTemplate(templateID)
 {
     if(!templateID) return;
-	if (confirm("您确认要删除该模板吗?")){
+	if (confirm(TemplateDelete)){
 		hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID);
 		$('#tplBox' + templateID).addClass('hidden');
 	}
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index ea1162771e..b2b76deffa 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -142,6 +142,7 @@ $lang->bug->setTemplateTitle     = '请输入bug模板标题';
 $lang->bug->remindTask           = '该Bug已经转化为任务，是否更新任务(编号:%s)状态 ?';
 $lang->bug->skipClose            = 'Bug %s 不是已解决状态，不能关闭。';
 $lang->bug->applyTemplate        = '应用模板';
+$lang->bug->TemplateDelete       = '您确认要删除该模板吗？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步骤]</p>\n";
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 936c0118ff..793e49bbef 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -19,6 +19,7 @@ js::set('page', 'create');
 js::set('createRelease', $lang->release->create);
 js::set('createBuild', $lang->build->create);
 js::set('refresh', $lang->refresh);
+js::set('TemplateDelete',$lang->bug->TemplateDelete);
 ?>
 <div class='container mw-1400px'>
   <div id='titlebar'>
diff --git a/module/todo/js/common.js b/module/todo/js/common.js
index 6a0ef6ad7f..30d634e178 100644
--- a/module/todo/js/common.js
+++ b/module/todo/js/common.js
@@ -36,7 +36,17 @@ function loadList(type, id)
 
     if(type == 'bug' || type == 'task')
     {
-        $(divClass).load(link, function(){$(divClass).find('select').chosen(defaultChosenOptions)});
+        //获取要待办的任务
+        $.get(link,function(data,status) {
+            if(data) { 
+                $(divClass).html(data);
+            } else {
+                //没有指派给自己的任务进行提醒，并重置.
+                alert(noTodo);
+                $("#type").val("custom");
+                $(divClass).html($(divID).html());
+            }
+        });
     }
     else if(type == 'custom')
     {
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 6e14f46661..b478399185 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -57,6 +57,7 @@ $lang->todo->typeList['task']   = $lang->projectCommon . '任务';
 $lang->todo->confirmDelete  = "您确定要删除这条待办吗？";
 $lang->todo->thisIsPrivate  = '这是一条私人事务。:)';
 $lang->todo->lblDisableDate = '暂时不设定时间';
+$lang->todo->noTodo         = '该类型没有待办事务';
 
 $lang->todo->periods['today']      = '今日';
 $lang->todo->periods['yesterday']  = '昨日';
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index af1b04cc7a..e3fc881c43 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::set('noTodo', $lang->todo->noTodo);?>
 <div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>