From bc4a40282e425b9d40169549e2ebc5bb942515f8 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 13 Jul 2018 10:47:17 +0800
Subject: [PATCH] * Detele todo lang and fix project link to plan bug.

---
 module/block/view/todoblock.html.php | 2 +-
 module/project/control.php           | 2 +-
 module/project/model.php             | 2 +-
 module/todo/lang/en.php              | 1 -
 module/todo/lang/zh-cn.php           | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index b051bb78ef..452e832df3 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -174,7 +174,7 @@
       {
           $("input[name='name']").addClass('has-error');
           $('#nameLabel').remove();
-          $("input[name='name']").after('<div id="nameLabel" class="text-danger help-text"><?php echo $lang->todo->noName ?></div>');
+          $("input[name='name']").after('<div id="nameLabel" class="text-danger help-text"><?php echo sprintf($lang->error->notempty, $lang->todo->name) ?></div>');
           setTimeout('clearError()', 2000)
           return false;
       }
diff --git a/module/project/control.php b/module/project/control.php
index 19f82dd774..547abeff0b 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2325,7 +2325,7 @@ class project extends control
             $planStories = array_keys($planStory);
             $this->project->linkStory($projectID, $planStories, $planProducts);
         }
-        if($count != 0) die(js::confirm(sprintf($this->lang->project->haveDraft, $count), $this->createLink('project', 'story', "projectID=$projectID")));
+        if($count != 0) echo js::alert(sprintf($this->lang->project->haveDraft, $count)) . js::locate($this->createLink('project', 'story', "projectID=$projectID"));
         die(js::locate(helper::createLink('project', 'story', 'projectID=' . $projectID), 'parent'));
     }
 
diff --git a/module/project/model.php b/module/project/model.php
index fe6e80b10e..97c8f50b30 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1614,7 +1614,7 @@ class projectModel extends model
             }
         }
         $this->linkStory($projectID, $planStories, $planProducts);
-        if($count != 0) die(js::confirm(sprintf($this->lang->project->haveDraft, $count), helper::createLink('project', 'create', "projectID=$projectID"))); 
+        if($count != 0) echo js::alert(sprintf($this->lang->project->haveDraft, $count)) . js::locate(helper::createLink('project', 'create', "projectID=$projectID"));
     }
 
     /**
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 4ae052017b..a8ff8c85ea 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -30,7 +30,6 @@ $lang->todo->import       = "Import";
 $lang->todo->legendBasic  = "Basic Info";
 $lang->todo->cycle        = "Recurrence";
 $lang->todo->cycleConfig  = "Set Recurrence";
-$lang->todo->noName       = "The Name should not be empty.";
 
 $lang->todo->reasonList['story'] = "Transfer Story";
 $lang->todo->reasonList['task']  = "Transfer Task";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index feca4d5fc9..d2232b52eb 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -30,7 +30,6 @@ $lang->todo->import       = "导入";
 $lang->todo->legendBasic  = "基本信息";
 $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期设置";
-$lang->todo->noName       = "『待办名称』不能为空。";
 
 $lang->todo->reasonList['story'] = "转需求";
 $lang->todo->reasonList['task']  = "转任务";