From 10524d52df77c20c575136ba3fe9de3e9d0b06b0 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 17 Dec 2012 07:06:29 +0000
Subject: [PATCH]  * revert the RM field and rename it to RD.

---
 module/product/control.php          | 2 ++
 module/product/lang/en.php          | 4 ++--
 module/product/lang/zh-cn.php       | 2 +-
 module/product/model.php            | 8 ++++----
 module/product/view/create.html.php | 6 +++++-
 module/product/view/edit.html.php   | 4 ++++
 module/product/view/view.html.php   | 5 +++++
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 96778fe9a1..e8ef61a3c3 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -179,6 +179,7 @@ class product extends control
         $this->view->groups        = $this->loadModel('group')->getPairs();
         $this->view->poUsers       = $this->loadModel('user')->getPairs('nodeleted|pofirst');
         $this->view->qdUsers       = $this->loadModel('user')->getPairs('nodeleted|qdfirst');
+        $this->view->rdUsers       = $this->loadModel('user')->getPairs('nodeleted|devfirst');
         $this->display();
     }
 
@@ -213,6 +214,7 @@ class product extends control
         $this->view->groups        = $this->loadModel('group')->getPairs();
         $this->view->poUsers       = $this->loadModel('user')->getPairs('nodeleted|pofirst');
         $this->view->qdUsers       = $this->loadModel('user')->getPairs('nodeleted|qdfirst');
+        $this->view->rdUsers       = $this->loadModel('user')->getPairs('nodeleted|devfirst');
 
         $this->display();
     }
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 2900384b3e..a0cde2d5b9 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -54,8 +54,8 @@ $lang->product->order     = 'Order';
 $lang->product->status    = 'Status';
 $lang->product->desc      = 'Desc';
 $lang->product->PO        = 'Product owner';
-$lang->product->QD        = 'Test manager';
-$lang->product->RM        = 'Release manager';
+$lang->product->QD        = 'Quality director';
+$lang->product->RD        = 'Release director';
 $lang->product->acl       = 'Access limitation';
 $lang->product->whitelist = 'Whitelist';
 
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 97ff7ccc0c..de11623960 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -55,7 +55,7 @@ $lang->product->status    = '状态';
 $lang->product->desc      = '产品描述';
 $lang->product->PO        = '产品负责人';
 $lang->product->QD        = '测试负责人';
-$lang->product->RM        = '发布负责人';
+$lang->product->RD        = '发布负责人';
 $lang->product->acl       = '访问控制';
 $lang->product->whitelist = '分组白名单';
 
diff --git a/module/product/model.php b/module/product/model.php
index f7336f2612..ac16d23fec 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -352,8 +352,8 @@ class productModel extends model
     public function getTeamMemberPairs($product)
     {
         $members[$product->PO] = $product->PO;
-        $members[$product->QM] = $product->QM;
-        $members[$product->RM] = $product->RM;
+        $members[$product->QD] = $product->QD;
+        $members[$product->RD] = $product->RD;
         $members[$product->createdBy] = $product->createdBy;
 
         /* Set projects and teams as static thus we can only query sql one times. */
@@ -541,8 +541,8 @@ class productModel extends model
                 ->where('t1.acl')->eq('open')
                 ->orWhere("(t1.acl = 'custom' AND $groupSql)")
                 ->orWhere('t1.PO')->eq($this->app->user->account)
-                ->orWhere('t1.QM')->eq($this->app->user->account)
-                ->orWhere('t1.RM')->eq($this->app->user->account)
+                ->orWhere('t1.QD')->eq($this->app->user->account)
+                ->orWhere('t1.RD')->eq($this->app->user->account)
                 ->orWhere('t1.createdBy')->eq($this->app->user->account)
                 ->orWhere('t3.account')->eq($this->app->user->account)
                 ->andWhere('t1.deleted')->eq(0)
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 5cdfdccc76..76b46a54c7 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -29,9 +29,13 @@
       <td><?php echo html::select('PO', $poUsers, $this->app->user->account, "class='select-3'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->product->QM;?></th>
+      <th class='rowhead'><?php echo $lang->product->QD;?></th>
       <td><?php echo html::select('QD', $qdUsers, '', "class='select-3'");?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->product->RD;?></th>
+      <td><?php echo html::select('RD', $rdUsers, '', "class='select-3'");?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->product->desc;?></th>
       <td><?php echo html::textarea('desc', '', "rows='8' class='area-1'");?></textarea></td>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 4aa0b17e23..f637c11756 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -31,6 +31,10 @@
       <th class='rowhead'><?php echo $lang->product->QD;?></th>
       <td><?php echo html::select('QD', $qdUsers, $product->QD, "class='select-3'");?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->product->RD;?></th>
+      <td><?php echo html::select('RD', $rdUsers, $product->RD, "class='select-3'");?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->product->status;?></th>
       <td><?php echo html::select('status', $lang->product->statusList, $product->status, "class='select-3'");?></td>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 26752f6444..9a27a5a6d0 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -64,6 +64,11 @@
             <th class='rowhead'><?php echo $lang->product->QD;?></th>
             <td><?php echo $users[$product->QD];?></td>
           </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->product->RD;?></th>
+            <td><?php echo $users[$product->RD];?></td>
+          </tr>  
+          <tr>
           <tr>
             <th class='rowhead'><?php echo $lang->product->status;?></th>
             <td><?php echo $lang->product->statusList[$product->status];?></td>