From eed834ee3c3561b6c32c7a13cd17eccf4b0a33ce Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 6 Jun 2016 11:40:47 +0800
Subject: [PATCH] * add source note when create a story.

---
 db/update8.2.1.sql                | 1 +
 module/story/control.php          | 2 ++
 module/story/lang/en.php          | 3 +++
 module/story/lang/zh-cn.php       | 3 +++
 module/story/view/create.html.php | 2 ++
 module/story/view/view.html.php   | 4 ++++
 6 files changed, 15 insertions(+)
 create mode 100644 db/update8.2.1.sql

diff --git a/db/update8.2.1.sql b/db/update8.2.1.sql
new file mode 100644
index 0000000000..aa204887a5
--- /dev/null
+++ b/db/update8.2.1.sql
@@ -0,0 +1 @@
+ALTER TABLE `zt_story` ADD `sourceNote` varchar(255) COLLATE 'utf8_general_ci' NOT NULL AFTER `source`;
diff --git a/module/story/control.php b/module/story/control.php
index 89573e5b68..e8c2ccf70b 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -118,6 +118,7 @@ class story extends control
 
         /* Init vars. */
         $source     = '';
+        $sourceNote = '';
         $pri        = 0;
         $estimate   = '';
         $title      = '';
@@ -177,6 +178,7 @@ class story extends control
         $this->view->plans            = $this->loadModel('productplan')->getPairs($productID, $branch, 'unexpired');
         $this->view->planID           = $planID;
         $this->view->source           = $source;
+        $this->view->sourceNote       = $sourceNote;
         $this->view->pri              = $pri;
         $this->view->branch           = $branch;
         $this->view->branches         = $product->type != 'normal' ? $this->loadModel('branch')->getPairs($productID) : array();
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 4487bd4868..ea84988035 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -41,6 +41,7 @@ $lang->story->product        = $lang->productCommon;
 $lang->story->module         = 'Module';
 $lang->story->moduleAB       = 'Module';
 $lang->story->source         = 'Source';
+$lang->story->sourceNote     = 'Source note';
 $lang->story->fromBug        = 'From bug';
 $lang->story->title          = 'Title';
 $lang->story->spec           = 'Spec';
@@ -127,6 +128,8 @@ $lang->story->sourceList['user']       = 'User';
 $lang->story->sourceList['po']         = $lang->productCommon . ' Owner';
 $lang->story->sourceList['market']     = 'Market';
 $lang->story->sourceList['service']    = 'Customer service';
+$lang->story->sourceList['operation']  = 'Operation';
+$lang->story->sourceList['support']    = 'Technical support';
 $lang->story->sourceList['competitor'] = 'Competitor';
 $lang->story->sourceList['partner']    = 'Partner';
 $lang->story->sourceList['dev']        = 'Developer';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 0bd52676dd..a4c1fffa5d 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -41,6 +41,7 @@ $lang->story->product        = "所属{$lang->productCommon}";
 $lang->story->module         = '所属模块';
 $lang->story->moduleAB       = '模块';
 $lang->story->source         = '需求来源';
+$lang->story->sourceNote     = '来源备注';
 $lang->story->fromBug        = '来源Bug';
 $lang->story->title          = '需求名称';
 $lang->story->spec           = '需求描述';
@@ -127,6 +128,8 @@ $lang->story->sourceList['user']       = '用户';
 $lang->story->sourceList['po']         = $lang->productCommon . '经理';
 $lang->story->sourceList['market']     = '市场';
 $lang->story->sourceList['service']    = '客服';
+$lang->story->sourceList['operation']  = '运营';
+$lang->story->sourceList['support']    = '技术支持';
 $lang->story->sourceList['competitor'] = '竞争对手';
 $lang->story->sourceList['partner']    = '合作伙伴';
 $lang->story->sourceList['dev']        = '开发人员';
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 51c140f795..6d9f2d5f0d 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -72,6 +72,8 @@
           <div class='input-group'>
             <span class='input-group-addon'><?php echo $lang->story->source?></span>
             <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control'");?>
+            <span class='input-group-addon fix-border'><?php echo $lang->comment?></span>
+            <?php echo html::input('sourceNote', $sourceNote, "class='form-control'");?>
           </div>
         </td>
         <?php endif;?>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index f4364cdb65..fbdcd5dd96 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -164,6 +164,10 @@
                 <th><?php echo $lang->story->source;?></th>
                 <td><?php echo $lang->story->sourceList[$story->source];?></td>
               </tr>
+              <tr>
+                <th><?php echo $lang->story->sourceNote;?></th>
+                <td id='sourceNote'><?php echo $story->sourceNote;?></td>
+              </tr>
               <tr>
                 <th><?php echo $lang->story->status;?></th>
                 <td class='story-<?php echo $story->status?>'><?php echo $lang->story->statusList[$story->status];?></td>