From 8083ea07fc9387ebc1817327b599b3a56d01be25 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 12 Jul 2018 14:33:40 +0800
Subject: [PATCH 1/2]  * fix bug #2036.

---
 module/message/css/setting.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/message/css/setting.css b/module/message/css/setting.css
index 63d3fcce1c..9279a6ca13 100644
--- a/module/message/css/setting.css
+++ b/module/message/css/setting.css
@@ -1,3 +1,6 @@
 .checkbox-primary + .checkbox-primary {margin:0px;}
-.checkbox-primary {margin:0px; margin-right:10px !important; width:100px;display:inline-block}
+.checkbox-primary {margin:0px; margin-right:10px !important; width:120px;display:inline-block}
+.checkbox-primary label{white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
 div.chosen-container + select + div.chosen-container > .chosen-choices {border-top:0px;}
+
+.table-bordered thead .checkbox-primary{width:200px;}

From c699bd74a5782eb311a7a845614562aa1b0a7c22 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 12 Jul 2018 14:35:36 +0800
Subject: [PATCH 2/2]  * change for batch change stage.

---
 module/product/view/browse.html.php | 5 +++--
 module/story/model.php              | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 6f69f3b44a..d4f5dace8b 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -270,8 +270,9 @@
                   echo "<li class='dropdown-submenu'>";
                   echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'");
                   echo "<ul class='dropdown-menu'>";
-                  $lang->story->stageList[''] = $lang->null;
-                  foreach($lang->story->stageList as $key => $stage)
+                  $stageList['verified'] = $lang->story->stageList['verified'];
+                  $stageList['closed']   = $lang->story->stageList['closed'];
+                  foreach($stageList as $key => $stage)
                   {
                       $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
                       echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
diff --git a/module/story/model.php b/module/story/model.php
index dc0ce05950..bbf8280118 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1040,12 +1040,10 @@ class storyModel extends model
             $story->lastEditedDate = $now;
             $story->stage          = $stage;
 
-            /* When stage is verified then only change to released. */
-            if($oldStory->stage == 'verified' and $story->stage != 'released')
+            if($stage == 'verified' or $stage == 'closed')
             {
-                $story->stage = 'verified';
                 $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
-                $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq('verified')->where('story')->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);
             }
         }