From 24fdb413bee55d9ccb5fb1698b2cf16d889e659c Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 21 Apr 2017 15:52:38 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20bug#1047=20=E9=9C=80=E6=B1=82=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E4=B9=8B=E5=90=8E=E9=87=8D=E6=96=B0=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=A6=81=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/story/model.php              |  1 -
 module/story/view/activate.html.php | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index e28d7a27d8..38e2c557fa 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1012,7 +1012,6 @@ class storyModel extends model
             ->add('lastEditedBy', $this->app->user->account)
             ->add('lastEditedDate', $now)
             ->add('assignedDate', $now)
-            ->add('status', 'active') 
             ->add('closedBy', '')
             ->add('closedReason', '')
             ->add('closedDate', '0000-00-00')
diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php
index ed4cb6bc94..80fb5de91e 100644
--- a/module/story/view/activate.html.php
+++ b/module/story/view/activate.html.php
@@ -24,6 +24,16 @@
       <th class='w-80px'><?php echo $lang->story->assignedTo;?></th>
       <td class='w-p45'><?php echo html::select('assignedTo', $users, $story->closedBy, 'class="form-control chosen"');?></td><td></td>
     </tr>
+    <tr>
+      <th><?php echo $lang->story->status;?></th>
+      <td>
+        <?php
+        unset($lang->story->statusList['']);
+        unset($lang->story->statusList['closed']);
+        echo html::select('status', $lang->story->statusList, 'active', 'class="form-control chosen"');
+        ?>
+      </td>
+    </tr>
     <tr>
       <th><?php echo $lang->story->comment;?></th>
       <td colspan='2'><?php echo html::textarea('comment', '', 'rows=5 class="area-1"');?></td>