* Finish task #49696.

This commit is contained in:
zhouxudong
2022-02-25 16:17:40 +08:00
parent 59f2dc528b
commit 0e15ad41b6
2 changed files with 26 additions and 3 deletions
+14
View File
@@ -515,6 +515,20 @@ class execution extends control
$mails = $this->execution->importBug($executionID);
if(dao::isError()) return print(js::error(dao::getError()));
/* If link from no head then reload. */
if(isonlybody())
{
$kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
$kanbanData = json_encode($kanbanData);
return print(js::reload('parent', '', "parent.parent.updateKanban($kanbanData)"));
// return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
}
else
{
return print(js::reload('parent.parent'));
}
if(isonlybody()) return print(js::reload('parent.parent'));
return print(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent'));
}
+12 -3
View File
@@ -70,18 +70,27 @@ var browseType = '<?php echo $browseType;?>';
<?php endforeach;?>
</tbody>
</table>
<?php if($bugs):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar show-always">
<?php echo html::submitButton('<i class="icon icon-import icon-sm"></i> ' . $lang->import, '', 'btn');?>
</div>
<div class='btn-toolbar'>
<?php echo html::backButton('', '', 'btn');?>
<?php if(isonlybody()):?>
<?php echo html::submitButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, 'onclick="goback()"', 'btn');?>
<?php else:?>
<?php echo html::backButton('','','btn');?>
<?php endif;?>
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
</div>
<script>
$(function(){parent.$('#triggerModal .modal-content .modal-header .close').hide();})
function goback()
{
parent.location.reload();
}
</script>
<?php include '../../common/view/footer.html.php';?>