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

Merge branch 'fixbug_sunjun_22696' into 'master'

Browse Source 
fixbug_sunjun_22696

See merge request easycorp/zentaopms!3539
This commit is contained in:
李玉春
2022-05-20 03:02:22 +00:00
parent 4e8ae522e4 ef9f67f252
commit 2eaf30a558
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/model.php
+3 -13
View File
@@ -343,20 +343,10 @@ class myModel extends model
if($objectType == 'task')
{
$projectList = array();
$executionList = array();
foreach($objectList as $task)
{
$projectList[$task->project] = $task->project;
$executionList[$task->execution] = $task->execution;
}
$objectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($projectList)->orWhere('id')->in($executionList)->fetchPairs('id');
foreach($objectList as $task)
{
$task->projectName = zget($objectPairs, $task->project, '');
$task->executionName = zget($objectPairs, $task->execution, '');
}
foreach($objectList as $task) $executionList[$task->execution] = $task->execution;
$objectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($executionList)->fetchPairs('id');
foreach($objectList as $task) $task->executionName = zget($objectPairs, $task->execution, '');
if($objectList) return $this->loadModel('task')->processTasks($objectList);
return $objectList;
module/my/view/bug.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
<th class='c-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<?php endif;?>
<th class='c-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
<th class='c-actions-5 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<?php
module/my/view/requirement.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<th class='c-hours'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='c-actions-6'> <?php echo $lang->actions;?></th>
<th class='c-actions-6 text-center'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/my/view/story.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
<th class='c-hours'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='c-actions-6'><?php echo $lang->actions;?></th>
<th class="c-actions-6 text-center"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/my/view/task.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
<th class='c-hours'><?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='c-hours'><?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-actions-6'><?php echo $lang->actions;?></th>
<th class="c-actions-6 text-center"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody id='myTaskList'>
module/my/view/testtask.html.php
+1 -1
View File
@@ -40,7 +40,7 @@
<th class='c-date'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='c-date'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-actions-6'><?php echo $lang->actions;?></th>
<th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>