From e4b44a2b0567110acbce5651aab33a7fd0b9e3b4 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Jun 2022 14:18:29 +0800
Subject: [PATCH] * Fix issue #678.

---
 module/execution/lang/en.php    | 4 ++--
 module/execution/lang/zh-cn.php | 4 ++--
 module/execution/model.php      | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 89cbbdb32b..c1069f6169 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -270,8 +270,8 @@ $lang->execution->treeOnlyTask        = 'Show Task Only';
 $lang->execution->treeOnlyStory       = 'Show Story Only';
 $lang->execution->storyKanban         = 'Story Kanban';
 $lang->execution->storySort           = 'Rank Story';
-$lang->execution->importPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
-$lang->execution->importEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan?';
+$lang->execution->importPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
+$lang->execution->importEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->needLinkProducts    = 'The execution has not been linked with any product, and the related functions cannot be used. Please link the product first and try again.';
 $lang->execution->iteration           = 'Iterations';
 $lang->execution->iterationInfo       = '%s Iterations';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 15b8062029..b026756280 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -270,8 +270,8 @@ $lang->execution->treeOnlyTask        = '树状图只看任务';
 $lang->execution->treeOnlyStory       = "树状图只看{$lang->SRCommon}";
 $lang->execution->storyKanban         = "{$lang->SRCommon}看板";
 $lang->execution->storySort           = "{$lang->SRCommon}排序";
-$lang->execution->importPlanStory     = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？';
-$lang->execution->importEditPlanStory = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？';
+$lang->execution->importPlanStory     = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将自动过滤掉草稿状态的' . $lang->SRCommon . '。';
+$lang->execution->importEditPlanStory = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将自动过滤掉草稿状态的' . $lang->SRCommon . '。';
 $lang->execution->needLinkProducts    = '该执行还未关联任何产品，相关功能无法使用，请先关联产品后再试。';
 $lang->execution->iteration           = '版本迭代';
 $lang->execution->iterationInfo       = '迭代%s次';
diff --git a/module/execution/model.php b/module/execution/model.php
index ed446ba683..eb642d6ba9 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2537,7 +2537,6 @@ class executionModel extends model
 
         $planStories  = array();
         $planProducts = array();
-        $count        = 0;
         $this->loadModel('story');
         if(!empty($plans))
         {
@@ -2554,7 +2553,6 @@ class executionModel extends model
                         {
                             if($story->status == 'draft')
                             {
-                                $count++;
                                 unset($planStory[$id]);
                                 continue;
                             }
@@ -2569,7 +2567,6 @@ class executionModel extends model
         $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
         $this->linkStory($executionID, $planStories, $planProducts);
         if($this->config->systemMode == 'new') $this->linkStory($projectID, $planStories, $planProducts);
-        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate(helper::createLink('execution', 'create', "projectID=$projectID&executionID=$executionID"));
     }
 
     /**