From 11bc6c16954d098f9896672b41829b079a50c2ee Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 10 Sep 2018 16:05:09 +0800
Subject: [PATCH]  * finish task #4760.

---
 module/product/view/browse.html.php |  5 ++---
 module/story/lang/en.php            |  1 +
 module/story/lang/zh-cn.php         |  1 +
 module/story/model.php              | 17 ++++++++++-------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index d4f5dace8b..763d547044 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -270,10 +270,9 @@
                   echo "<li class='dropdown-submenu'>";
                   echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'");
                   echo "<ul class='dropdown-menu'>";
-                  $stageList['verified'] = $lang->story->stageList['verified'];
-                  $stageList['closed']   = $lang->story->stageList['closed'];
-                  foreach($stageList as $key => $stage)
+                  foreach($lang->story->stageList as $key => $stage)
                   {
+                      if(empty($key)) continue;
                       $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
                       echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
                   }
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index b393762bb7..72088190c4 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -195,6 +195,7 @@ $lang->story->errorEmptyChildStory  = '『Subdivide Story』canot be blank.';
 $lang->story->mustChooseResult      = 'Select Result';
 $lang->story->mustChoosePreVersion  = 'Select the Version to revert to.';
 $lang->story->noStory               = 'No stories. ';
+$lang->story->failChangeStage       = 'The status of story %s is draft, that fail to change stage.';
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = 'Story Scope';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 0ece1bf8a7..91d595c1c6 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -195,6 +195,7 @@ $lang->story->errorEmptyChildStory  = '『细分需求』不能为空。';
 $lang->story->mustChooseResult      = '必须选择评审结果';
 $lang->story->mustChoosePreVersion  = '必须选择回溯的版本';
 $lang->story->noStory               = '暂时没有需求。';
+$lang->story->failChangeStage       = '需求 %s 为草稿状态，没有修改其阶段。';
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = '该需求所属范围';
diff --git a/module/story/model.php b/module/story/model.php
index d6eb84f980..d3ed9224ce 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1030,23 +1030,26 @@ class storyModel extends model
         $now         = helper::now();
         $allChanges  = array();
         $oldStories  = $this->getByList($storyIDList);
+        $failStories = '';
         foreach($storyIDList as $storyID)
         {
             $oldStory = $oldStories[$storyID];
-            if($oldStory->status == 'draft') continue;
+            if($oldStory->status == 'draft')
+            {
+                $failStories .= "#{$storyID} ";
+                continue;
+            }
 
             $story = new stdclass();
             $story->lastEditedBy   = $this->app->user->account;
             $story->lastEditedDate = $now;
             $story->stage          = $stage;
 
-            if($stage == 'verified' or $stage == 'closed')
-            {
-                $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
-                $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->where('story')->eq((int)$storyID)->exec();
-                if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story);
-            }
+            $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
+            $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->where('story')->eq((int)$storyID)->exec();
+            if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story);
         }
+        if($failStories) echo js::alert(sprintf($this->lang->story->failChangeStage, $failStories));
         return $allChanges;
     }