* Fix bug: hidden story or bug in kanban or sprint.

This commit is contained in:
zhujinyong
2023-02-28 10:10:37 +08:00
parent 445c93b4a9
commit 60198497ba
3 changed files with 7 additions and 6 deletions
+2
View File
@@ -1548,6 +1548,7 @@ class execution extends control
$this->view->executionName = $execution->name;
$this->view->executionID = $executionID;
$this->view->chartData = $chartData;
$this->view->features = $this->execution->getExecutionFeatures($execution);
$this->view->begin = $begin;
$this->view->end = $end;
$this->view->minDate = $minDate;
@@ -2590,6 +2591,7 @@ class execution extends control
$this->view->chartData = $chartData;
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->view->type = $type;
$this->view->features = $this->execution->getExecutionFeatures($execution);
$this->view->project = $this->loadModel('project')->getByID($execution->project);
$this->display();
+2 -2
View File
@@ -33,11 +33,11 @@
$weekend = $withWeekend == 'true' ? 'noweekend' : 'withweekend';
echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
?>
<?php if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))):?>
<?php if(!$features['story']) unset($lang->execution->cfdTypeList['story']);?>
<?php if(!$features['qa']) unset($lang->execution->cfdTypeList['bug']);?>
<div class='input-control w-140px'>
<?php echo html::select('type', $lang->execution->cfdTypeList, $type, "class='form-control chosen'");?>
</div>
<?php endif;?>
<div id="cfdDateSelect">
<form method='post' class='form-ajax not-watch'>
<div class='input-group'>
+3 -4
View File
@@ -420,14 +420,13 @@
<table class="table table-data data-basic">
<tbody>
<tr>
<?php if($execution->lifetime == 'ops' or in_array($execution->attribute, array('request', 'review'))):?>
<th><?php echo $lang->task->common;?></th>
<td><?php echo $statData->taskCount;?></td>
<?php else:?>
<?php if($features['story']):?>
<th><?php echo $lang->story->common;?></th>
<td><?php echo $statData->storyCount;?></td>
<?php endif;?>
<th><?php echo $lang->task->common;?></th>
<td><?php echo $statData->taskCount;?></td>
<?php if($features['qa']):?>
<th><?php echo $lang->bug->common;?></th>
<td><?php echo $statData->bugCount;?></td>
<?php endif;?>