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

+ finish the task #541 543

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2011-10-12 01:53:19 +00:00
parent 896dcce902
commit 62b09d8dad
13 changed files with 268 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.custom.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
{
echo $users[$bug->$fieldName];
}
elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status)$/i', $fieldName))
elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status|confirm)$/i', $fieldName))
{
$key = $fieldName . 'List';
$list = $lang->bug->$key;
module/bug/view/browse.html.php
+2 -2
View File
@@ -70,7 +70,7 @@ var customed = <?php echo (int)$customed;?>;
<th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->statusAB);?></th>
<th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->statusAB);?></th>
<?php endif;?>
<?php if($browseType == 'needconfirm'):?>
@@ -107,7 +107,7 @@ var customed = <?php echo (int)$customed;?>;
<td class='a-left nobr'><?php echo html::a($bugLink, $bug->title);?></td>
<?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
<td><?php echo $lang->bug->statusList[$bug->status]?></td>
<td><?php echo $lang->bug->statusList[$bug->status];echo '[' . $lang->bug->confirmList[$bug->confirm] . ']';?></td>
<?php endif;?>
<?php if($browseType == 'needconfirm'):?>
module/bug/view/confirmbug.html.php
Executable
+31
View File
@@ -0,0 +1,31 @@
<?php
/**
* The resolve file of bug module of ZenTaoPMS.
*
* @copyright Copyright 2009-2011 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package bug
* @version $Id: resolve.html.php 1914 2011-06-24 10:11:25Z yidong@cnezsoft.com $
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<form method='post' target='hiddenwin'>
<table class='table-1'>
<caption><?php echo $bug->title;?></caption>
<tr>
<td class='rowhead'><?php echo $lang->comment;?></td>
<td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'>
<?php echo html::submitButton($lang->bug->buttonConfirm);?>
<input type='button' value='<?php echo $lang->bug->buttonToList;?>' class='button-s'
onclick='location.href="<?php echo $this->session->bugList;?>"' />
</td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>
</form>
<?php include '../../common/view/footer.html.php';?>
module/bug/view/edit.html.php
+4
View File
@@ -97,6 +97,10 @@ userList = "<?php echo join(',', array_keys($users));?>".split(','
<td class='rowhead'><?php echo $lang->bug->status;?></td>
<td><?php echo html::select('status', $lang->bug->statusList, $bug->status, 'class=select-3');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->confirm;?></td>
<td><?php echo $lang->bug->confirmList[$bug->confirm];?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
<td><?php echo html::select('assignedTo', $users, $bug->assignedTo, 'class=select-3');?></td>
module/bug/view/view.html.php
+6
View File
@@ -20,6 +20,7 @@
$copyParams = "productID=$productID&extra=bugID=$bug->id";
if(!$bug->deleted)
{
if(!($bug->status == 'active' and $bug->confirm == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
if(!($bug->status == 'active' and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' ';
@@ -45,6 +46,7 @@
<?php
if(!$bug->deleted)
{
if(!($bug->status == 'active' and $bug->confirm == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
if(!($bug->status == 'active' and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' ';
@@ -93,6 +95,10 @@
<td class='rowhead'><?php echo $lang->bug->status;?></td>
<td><strong><?php echo $lang->bug->statusList[$bug->status];?></strong></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->confirm;?></td>
<td><strong><?php echo $lang->bug->confirmList[$bug->confirm];?></strong></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->lblAssignedTo;?></td>
<td><?php if($bug->assignedTo) echo $users[$bug->assignedTo] . $lang->at . $bug->assignedDate;?></td>