From afcc39361b86f9382cf7c2d18520354fd2ea6783 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Fri, 23 Dec 2011 02:02:10 +0000
Subject: [PATCH]  * adjust code for the task #655.

---
 module/bug/lang/en.php           |  1 +
 module/bug/lang/zh-cn.php        |  1 +
 module/bug/view/resolve.html.php |  2 +-
 module/story/model.php           | 13 ++++++++-----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index a5565bc237..0552d464ed 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -235,6 +235,7 @@ $lang->bug->resolutionList['fixed']      = 'Fixed';
 $lang->bug->resolutionList['notrepro']   = 'Not reproduce';
 $lang->bug->resolutionList['postponed']  = 'Postponed';
 $lang->bug->resolutionList['willnotfix'] = "Won't fix";
+$lang->bug->resolutionList['tostory']    = 'To story';
 
 /* Report. */
 $lang->bug->report->common        = 'Report';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index b314b54500..0998ade191 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -235,6 +235,7 @@ $lang->bug->resolutionList['fixed']      = '已解决';
 $lang->bug->resolutionList['notrepro']   = '无法重现';
 $lang->bug->resolutionList['postponed']  = '延期处理';
 $lang->bug->resolutionList['willnotfix'] = "不予解决";
+$lang->bug->resolutionList['tostory']    = '转为需求';
 
 /* 统计报表。*/
 $lang->bug->report->common        = '统计报表';
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index beb6bb5f10..7c88839050 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -16,7 +16,7 @@
     <caption><?php echo $bug->title;?></caption>
     <tr>
       <td class='rowhead'><?php echo $lang->bug->resolution;?></td>
-      <td><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=select-3 onchange=setDuplicate(this.value)');?></td>
+      <td><?php unset($lang->bug->resolutionList['tostory']); echo html::select('resolution', $lang->bug->resolutionList, '', 'class=select-3 onchange=setDuplicate(this.value)');?></td>
     </tr>
     <tr id='duplicateBugBox' style='display:none'>
       <td class='rowhead'><?php echo $lang->bug->duplicateBug;?></td>
diff --git a/module/story/model.php b/module/story/model.php
index 85da32aefd..e2509c0469 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -145,11 +145,14 @@ class storyModel extends model
             
             if($bugID > 0)
             {
-                $bug->toStory = $storyID;
-                $bug->status  = 'closed';
-                $bug->closedBy = $this->app->user->account;
-                $bug->closedDate = $now;
-                $bug->assignedTo = 'closed';
+                $bug->toStory      = $storyID;
+                $bug->status       = 'closed';
+                $bug->resolution   = 'tostory';
+                $bug->resolvedBy   = $this->app->user->account;
+                $bug->resolvedDate = $now;
+                $bug->closedBy     = $this->app->user->account;
+                $bug->closedDate   = $now;
+                $bug->assignedTo   = 'closed';
                 $this->dao->update(TABLE_BUG)->data($bug)->exec();
     
                 $this->loadModel('action')->create('bug', $bugID, 'ToStory', '', $storyID);