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

Merge branch 'sprint/master_zhouxudong_61441' into 'master'

Browse Source 
Sprint/master zhouxudong 61441

See merge request easycorp/zentaopms!4606
This commit is contained in:
王怡栋
2022-07-21 02:03:20 +00:00
parent 165dc24575 9d5f891419
commit 660f0d0d85
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/importbug.js
+4
View File
@@ -23,5 +23,9 @@ function goback(executionID)
kanbanData = $.parseJSON(data);
parent.updateKanban(kanbanData);
}
else
{
parent.location.reload();
}
});
}
module/execution/view/taskkanban.html.php
+1 -1
View File
@@ -113,7 +113,7 @@
echo $batchCreateBugLink;
}?>
<?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
<?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "execution=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe'") . '</li>';?>
<?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "execution=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe' data-width='90%'") . '</li>';?>
<?php endif;?>
<?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe'") . '</li>';?>
<?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe' data-width=90%") . '</li>';?>
module/task/config.php
+1 -1
View File
@@ -28,7 +28,7 @@ $config->task->editor->pause = array('id' => 'comment', 'tools' => 'simpleToo
$config->task->removeFields = 'objectTypeList,productList,executionList,gitlabID,gitlabProjectID,product';
$config->task->exportFields = '
id, execution, module, story,
id, execution, module, story, fromBug,
name, desc,
type, pri,estStarted, realStarted, deadline, status,estimate, consumed, left,
mailto, progress, mode,
module/task/control.php
+8 -1
View File
@@ -2083,7 +2083,11 @@ class task extends control
/* Get related objects id lists. */
$relatedStoryIdList = array();
foreach($tasks as $task) $relatedStoryIdList[$task->story] = $task->story;
foreach($tasks as $task)
{
$relatedStoryIdList[$task->story] = $task->story;
$relatedBugIdList[$task->fromBug] = $task->fromBug;
}
/* Get team for multiple task. */
$taskTeam = $this->dao->select('*')->from(TABLE_TEAM)
@@ -2190,6 +2194,7 @@ class task extends control
}
}
$bugs = $this->loadModel('bug')->getByList($relatedBugIdList);
foreach($tasks as $task)
{
if($this->post->fileType == 'csv')
@@ -2203,6 +2208,8 @@ class task extends control
/* fill some field with useful value. */
$task->story = isset($relatedStories[$task->story]) ? $relatedStories[$task->story] . "(#$task->story)" : '';
$task->fromBug = empty($task->fromBug) ? '' : "#$task->fromBug " . $bugs[$task->fromBug]->title;
if(isset($executions[$task->execution])) $task->execution = $executions[$task->execution] . "(#$task->execution)";
if(isset($taskLang->typeList[$task->type])) $task->type = $taskLang->typeList[$task->type];
if(isset($taskLang->priList[$task->pri])) $task->pri = $taskLang->priList[$task->pri];