Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* revert the RM field and rename it to RD.

Browse Source
This commit is contained in:
wangchunsheng
2012-12-17 07:06:29 +00:00
parent ecad94a7de
commit 10524d52df
7 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/product/control.php
View File

@@ -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();
}

4
module/product/lang/en.php
View File

@@ -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';

2
module/product/lang/zh-cn.php
View File

@@ -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 = '分组白名单';

8
module/product/model.php
View File

@@ -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)

6
module/product/view/create.html.php
View File

@@ -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>

4
module/product/view/edit.html.php
View File

@@ -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>

5
module/product/view/view.html.php
View File

@@ -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>