From af5d5a42687d6d4a00b18ddb71f087909e49faea Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Sat, 8 Oct 2011 08:48:51 +0000
Subject: [PATCH]  * task#561

---
 module/product/config.php         |  2 ++
 module/story/config.php           |  2 +-
 module/story/lang/en.php          | 10 ++++++++++
 module/story/lang/zh-cn.php       | 10 ++++++++++
 module/story/view/create.html.php |  6 +++++-
 module/story/view/edit.html.php   |  4 ++++
 module/story/view/view.html.php   |  4 ++++
 7 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/module/product/config.php b/module/product/config.php
index 235cb7875c..8517e3c9bb 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -7,6 +7,7 @@ $config->product->search['fields']['id']             = $lang->story->id;
 $config->product->search['fields']['keywords']       = $lang->story->keywords;
 $config->product->search['fields']['pri']            = $lang->story->pri;
 $config->product->search['fields']['plan']           = $lang->story->plan;
+$config->product->search['fields']['origin']         = $lang->story->origin;
 $config->product->search['fields']['assignedTo']     = $lang->story->assignedTo;
 $config->product->search['fields']['product']        = $lang->story->product;
 $config->product->search['fields']['openedBy']       = $lang->story->openedBy;
@@ -21,6 +22,7 @@ $config->product->search['params']['title']        = array('operator' => 'includ
 $config->product->search['params']['keywords']     = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->product->search['params']['pri']          = array('operator' => '=',       'control' => 'select', 'values' => $lang->story->priList);
 $config->product->search['params']['plan']         = array('operator' => '=',       'control' => 'select', 'values' => '');
+$config->product->search['params']['origin']       = array('operator' => '=',       'control' => 'select', 'values' => $lang->story->originList);
 $config->product->search['params']['product']      = array('operator' => '=',       'control' => 'select', 'values' => '');
 $config->product->search['params']['assignedTo']   = array('operator' => '=',       'control' => 'select', 'values' => 'users');
 $config->product->search['params']['resolvedBy']   = array('operator' => '=',       'control' => 'select', 'values' => 'users');
diff --git a/module/story/config.php b/module/story/config.php
index 4b3f02d9e0..ff0e2b17b5 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -9,7 +9,7 @@ $config->story->editor->create = array('id' => 'spec,verify', 'tools' => 'simple
 $config->story->editor->change = array('id' => 'spec,verify', 'tools' => 'simpleTools');
 
 $config->story->list->exportFields = '
-    id, product, module, plan, title, spec, verify, keywords, 
+    id, product, module, plan, origin, title, spec, verify, keywords, 
     pri, estimate, status, stage,
     openedBy, openedDate, assignedTo, assignedDate, mailto, 
     reviewedBy, reviewedDate, 
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index cba55fbeb8..c6317553a7 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -30,6 +30,7 @@ $lang->story->common         = 'Story';
 $lang->story->id             = 'ID';
 $lang->story->product        = 'Product';
 $lang->story->module         = 'Module';
+$lang->story->origin         = 'Origin';
 $lang->story->release        = 'Release';
 $lang->story->bug            = 'Related Bug';
 $lang->story->title          = 'Title';
@@ -101,6 +102,15 @@ $lang->story->reviewResultList['revert'] = 'Revert';
 $lang->story->reviewResultList['clarify']= 'Clarify';
 $lang->story->reviewResultList['reject'] = 'Reject';
 
+$lang->story->originList['']           = '';
+$lang->story->originList['custom']     = 'Custom';
+$lang->story->originList['PO']         = 'PO';
+$lang->story->originList['market']     = 'Market';
+$lang->story->originList['service']    = 'Service';
+$lang->story->originList['competitor'] = 'Competitor';
+$lang->story->originList['partner']    = 'Partner';
+$lang->story->originList['other']      = 'Other';
+
 $lang->story->priList[]   = '';
 $lang->story->priList[3]  = '3';
 $lang->story->priList[1]  = '1';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 124e5d0a68..ab1305f8bc 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -30,6 +30,7 @@ $lang->story->common         = '需求';
 $lang->story->id             = '编号';
 $lang->story->product        = '所属产品';
 $lang->story->module         = '所属模块';
+$lang->story->origin         = '来源';
 $lang->story->release        = '发布计划';
 $lang->story->bug            = '相关bug';
 $lang->story->title          = '需求名称';
@@ -101,6 +102,15 @@ $lang->story->reviewResultList['revert'] = '撤销变更';
 $lang->story->reviewResultList['clarify']= '有待明确';
 $lang->story->reviewResultList['reject'] = '拒绝';
 
+$lang->story->originList['']           = '';
+$lang->story->originList['custom']     = '客户';
+$lang->story->originList['PO']         = '产品经理';
+$lang->story->originList['market']     = '市场';
+$lang->story->originList['service']    = '客服';
+$lang->story->originList['competitor'] = '竞争对手';
+$lang->story->originList['partner']    = '合伙人';
+$lang->story->originList['other']      = '其他';
+
 $lang->story->priList[]   = '';
 $lang->story->priList[3]  = '3';
 $lang->story->priList[1]  = '1';
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index ed1004374f..22f6b7d8c9 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -26,7 +26,11 @@
       <th class='rowhead'><?php echo $lang->story->plan;?></th>
       <td><span id='planIdBox'><?php echo html::select('plan', $plans, $planID, 'class=select-3');?></span></td>
     </tr>
-   <tr>
+    <tr>
+      <th class='rowhead'><?php echo $lang->story->origin;?></th>
+      <td><?php echo html::select('origin', $lang->story->originList, '', 'class=select-3');?></td>
+    </tr>
+    <tr>
       <th class='rowhead'><?php echo $lang->story->title;?></th>
       <td><?php echo html::input('title', $title, "class='text-1'");?></td>
     </tr>  
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 894a459745..1313f5ada3 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -53,6 +53,10 @@
             <td class='rowhead'><?php echo $lang->story->plan;?></td>
             <td><span id='planIdBox'><?php echo html::select('plan', $plans, $story->plan, 'class=select-1');?></span></td>
           </tr>
+          <tr>
+            <th class='rowhead'><?php echo $lang->story->origin;?></th>
+            <td><?php echo html::select('origin', $lang->story->originList, $lang->story->originList[$story->origin], 'class=select-1');?></td>
+          </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->story->status;?></td>
             <td><?php echo $lang->story->statusList[$story->status];?></td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 36c0f0fad4..7d5c2a3537 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -91,6 +91,10 @@
             <td class='rowhead'><?php echo $lang->story->plan;?></td>
             <td><?php if(isset($story->planTitle)) if(!common::printLink('productplan', 'view', "planID=$story->plan", $story->planTitle)) echo $story->planTitle;?>
           </tr>
+          <tr>
+            <td class='rowhead'><?php echo $lang->story->origin;?></td>
+            <td><?php echo $lang->story->originList[$story->origin];?></td>
+          </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->story->status;?></td>
             <td><?php echo $lang->story->statusList[$story->status];?></td>