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

Merge branch '12.x'

Browse Source
This commit is contained in:
z
2020-11-23 20:42:59 +08:00
parent 6ce3a0345b a6b21d74b7
commit b42d47e257
230 changed files with 5568 additions and 1943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/bug.html.php
+11 -7
View File
@@ -73,11 +73,12 @@
?>
<tbody>
<?php foreach($bugs as $bug):?>
<?php $canBeChanged = common::canBeChanged('bug', $bug);?>
<tr>
<td class="c-id">
<?php if($canBatchAction):?>
<div class="checkbox-primary">
<input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>' />
<input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>' <?php if(!$canBeChanged) echo 'disabled';?> />
<label></label>
</div>
<?php endif;?>
@@ -99,12 +100,15 @@
<td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>
<td class='c-actions'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true, '', '', $bug->PRJ);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true, '', '', $bug->PRJ);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true, '', '', $bug->PRJ);
common::printIcon('bug', 'edit', $params, $bug, 'list', '', '', '', '', '', '', $bug->PRJ);
common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', '', '', '', '', $bug->PRJ);
if($canBeChanged)
{
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true, '', '', $bug->PRJ);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true, '', '', $bug->PRJ);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true, '', '', $bug->PRJ);
common::printIcon('bug', 'edit', $params, $bug, 'list', '', '', '', '', '', '', $bug->PRJ);
common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', '', '', '', '', $bug->PRJ);
}
?>
</td>
</tr>