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

* fix bug.

Browse Source
This commit is contained in:
wangyidong
2018-02-07 13:50:41 +08:00
parent db1224f37a
commit 3cde365b5c
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/batchcreate.html.php
+1 -1
View File
@@ -39,7 +39,7 @@ foreach(explode(',', $showFields) as $field)
<tr>
<th class='w-50px'> <?php echo $lang->idAB;?></th>
<th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'> <?php echo $lang->product->branch;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'module', ' hidden')?>'> <?php echo $lang->bug->module;?> <span class='required'></span></th>
<th class='w-120px'> <?php echo $lang->bug->module;?> <span class='required'></span></th>
<th class='w-130px<?php echo zget($visibleFields, 'project', ' hidden')?>'><?php echo $lang->bug->project;?></th>
<th><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
<th><?php echo $lang->bug->title;?> <span class='required'></span></th>
module/story/view/batchcreate.html.php
+1 -1
View File
@@ -40,7 +40,7 @@ if($this->story->checkForceReview()) unset($visibleFields['review']);
<tr class='text-center'>
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
<th class='w-p15<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->story->module;?> <span class='required'></span></th>
<th class='w-p15'><?php echo $lang->story->module;?> <span class='required'></span></th>
<th class='w-p15<?php echo zget($visibleFields, 'plan', ' hidden')?>'><?php echo $lang->story->plan;?></th>
<th <?php if(count($visibleFields) >= 9) echo "class='w-150px'"?>><?php echo $lang->story->title;?> <span class='required'></span></th>
<th class='w-p15<?php echo zget($visibleFields, 'spec', ' hidden')?>'><?php echo $lang->story->spec;?></th>
module/story/view/batchedit.html.php
+1 -1
View File
@@ -42,7 +42,7 @@ foreach(explode(',', $showFields) as $field)
<?php if($branchProduct):?>
<th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->story->branch;?></th>
<?php endif;?>
<th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->story->module;?></th>
<th class='w-150px'><?php echo $lang->story->module;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'plan', ' hidden')?>'><?php echo $lang->story->planAB;?></th>
<th class='w-150px'> <?php echo $lang->story->title;?> <span class='required'></span></th>
<th class='w-50px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
module/testreport/control.php
+7
View File
@@ -192,6 +192,13 @@ class testreport extends control
$stories = $this->story->getProjectStories($project->id);
$builds = $this->build->getProjectBuilds($project->id);
$useBuilds = array();
foreach($tasks as $task)
{
if(isset($builds[$task->build])) $useBuilds[$task->build] = $builds[$task->build];
}
$builds = $useBuilds;
$begin = $project->begin;
$end = $project->end;
$owner = current($owners);