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

sprint_60477

Browse Source
This commit is contained in:
sunjun
2022-07-12 08:14:48 +00:00
parent 53a977af20
commit e8dc136b0e
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1
View File
@@ -2027,6 +2027,7 @@ class bug extends control
*/
public function batchClose()
{
if($this->post->unlinkBugs) $this->post->bugIDList = $this->post->unlinkBugs;
if($this->post->bugIDList)
{
$bugIDList = $this->post->bugIDList;
module/projectrelease/view/view.html.php
+16 -4
View File
@@ -150,9 +150,10 @@
<div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
<div class='linkBox cell hidden'></div>
<?php endif;?>
<form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm' data-ride="table">
<form class='main-table table-bug' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
<table class='table has-sort-head' id='bugList'>
<?php $canBatchUnlink = common::hasPriv('projectrelease', 'batchUnlinkBug');?>
<?php $canBatchClose = common::hasPriv('bug', 'batchClose');?>
<?php $vars = "releaseID={$release->id}&type=bug&link=$link&param=$param&orderBy=%s";?>
<thead>
<tr class='text-center'>
@@ -178,7 +179,7 @@
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr>
<td class='c-id text-left'>
<?php if($canBatchUnlink and $canBeChanged):?>
<?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
<div class="checkbox-primary">
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<label></label>
@@ -208,10 +209,21 @@
</tbody>
</table>
<div class='table-footer'>
<?php if($countBugs and $canBatchUnlink and $canBeChanged):?>
<?php if($countBugs and ($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
<?php
if($canBatchUnlink and $canBeChanged)
{
$unlinkURL = $this->createLink('projectrelease', 'batchUnlinkBug', "releaseID=$release->id");
echo html::a("###", $lang->release->batchUnlink, '', "onclick='setFormAction(\"$unlinkURL\", \"hiddenwin\", this)' class='btn'");
}
if($canBatchClose and $canBeChanged)
{
$closeURL = $this->createLink('bug', 'batchClose');
echo html::a("###", $lang->story->batchClose, '', "onclick='setFormAction(\"$closeURL\", \"hiddenwin\", this)' class='btn'");
}
?>
</div>
<div class='table-statistic'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
<?php endif;?>
module/release/view/view.html.php
+16 -4
View File
@@ -152,9 +152,10 @@
<div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
<div class='linkBox cell hidden'></div>
<?php endif;?>
<form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm' data-ride="table">
<form class='main-table table-bug' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
<table class='table has-sort-head' id='bugList'>
<?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
<?php $canBatchClose = common::hasPriv('bug', 'batchClose');?>
<?php $vars = "releaseID={$release->id}&type=bug&link=$link&param=$param&orderBy=%s";?>
<thead>
<tr class='text-center'>
@@ -180,7 +181,7 @@
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr>
<td class='c-id text-left'>
<?php if($canBatchUnlink and $canBeChanged):?>
<?php if($canBatchUnlink or $canBatchClose and $canBeChanged):?>
<div class="checkbox-primary">
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<label></label>
@@ -210,10 +211,21 @@
</tbody>
</table>
<div class='table-footer'>
<?php if($countBugs and $canBatchUnlink and $canBeChanged):?>
<?php if($countBugs and ($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
<?php
if($canBatchUnlink)
{
$unlinkURL = inlink('batchUnlinkBug', "release=$release->id");
echo html::a('###', $lang->release->batchUnlink, '', "onclick='setFormAction(\"$unlinkURL\", \"hiddenwin\", this)' class='btn'");
}
if($canBatchClose)
{
$closeURL = $this->createLink('bug', 'batchClose');
echo html::a("###", $lang->story->batchClose, '', "onclick='setFormAction(\"$closeURL\", \"hiddenwin\", this)' class='btn'");
}
?>
</div>
<div class='table-statistic'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
<?php endif;?>