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

Merge branch release/21.7.7 of zentao/zentaopms (#12422)

Browse Source
This commit is contained in:
刘刚
2025-11-20 08:58:41 +08:00
committed by Gitfox
parent 2fe972677c 97e77060e2
commit 0c0b695eec
8 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/block/ext/config/lite.php
+2
View File
@@ -3,3 +3,5 @@ $config->block->projectstatistic->items['story'] = array();
$config->block->projectstatistic->items['story'][] = array('field' => 'storyPoints', 'unit' => 'unit');
$config->block->projectstatistic->items['story'][] = array('field' => 'done', 'unit' => 'unit');
$config->block->projectstatistic->items['story'][] = array('field' => 'undone', 'unit' => 'unit');
unset($config->block->projectstatistic->items['bug']);
extension/lite/block/ext/lang/de/lite.php
+2
View File
@@ -19,6 +19,8 @@ $lang->block->story = 'Target';
$lang->block->storyCount = 'Target Count';
$lang->block->projectstatistic->story = 'Target';
$lang->block->default['full']['my'][] = array('title' => 'Kanban List', 'module' => 'execution', 'code' => 'scrumlist', 'width' => '2', 'height' => '6', 'left' => '0', 'top' => '45', 'params' => array('type' => 'doing', 'orderBy' => 'id_desc', 'count' => '15'));
$lang->block->modules['kanban'] = new stdclass();
extension/lite/block/ext/lang/en/lite.php
+2
View File
@@ -19,6 +19,8 @@ $lang->block->story = 'Target';
$lang->block->storyCount = 'Target Count';
$lang->block->projectstatistic->story = 'Target';
$lang->block->default['full']['my'][] = array('title' => 'Kanban List', 'module' => 'execution', 'code' => 'scrumlist', 'width' => '2', 'height' => '6', 'left' => '0', 'top' => '45', 'params' => array('type' => 'doing', 'orderBy' => 'id_desc', 'count' => '15'));
$lang->block->modules['kanban'] = new stdclass();
extension/lite/block/ext/lang/fr/lite.php
+2
View File
@@ -19,6 +19,8 @@ $lang->block->story = 'Target';
$lang->block->storyCount = 'Target Count';
$lang->block->projectstatistic->story = 'Target';
$lang->block->default['full']['my'][] = array('title' => 'Kanban List', 'module' => 'execution', 'code' => 'scrumlist', 'width' => '2', 'height' => '6', 'left' => '0', 'top' => '45', 'params' => array('type' => 'doing', 'orderBy' => 'id_desc', 'count' => '15'));
$lang->block->modules['kanban'] = new stdclass();
extension/lite/block/ext/lang/zh-cn/lite.php
+2
View File
@@ -19,6 +19,8 @@ $lang->block->story = '目标';
$lang->block->storyCount = '目标数';
$lang->block->projectstatistic->story = '目标';
$lang->block->default['full']['my'][] = array('title' => '看板列表', 'module' => 'execution', 'code' => 'scrumlist', 'width' => '2', 'height' => '6', 'left' => '0', 'top' => '45', 'params' => array('type' => 'doing', 'orderBy' => 'id_desc', 'count' => '15'));
$lang->block->modules['kanbanproject'] = new stdclass();
module/testreport/control.php
+2
View File
@@ -180,6 +180,8 @@ class testreport extends control
if($executionID != $objectID) return $this->send(array('result' => 'fail', 'load' => array('confirm' => $this->lang->error->accessDenied, 'confirmed' => inlink('browse', "proudctID={$productID}"), 'canceled' => inlink('browse', "proudctID={$productID}"))));
$reportData = $this->testreportZen->assignProjectReportDataForCreate($objectID, $objectType, $extra, $begin, $end, $executionID);
if(count($reportData['productIdList']) > 1 && !in_array($this->config->edition, array('max', 'ipd'))) return $this->send(array('result' => 'fail', 'load' => array('confirm' => $this->lang->testreport->moreProduct, 'confirmed' => $this->createLink($objectType, 'testtask', "objectID={$objectID}"), 'canceled' => $this->createLink($objectType, 'testtask', "objectID={$objectID}"))));
}
$this->testreportZen->assignReportData($reportData, 'create');
module/testtask/config/table.php
+1 -1
View File
@@ -31,7 +31,7 @@ $config->testtask->dtable->fieldList['buildName']['name'] = 'buildName';
$config->testtask->dtable->fieldList['buildName']['title'] = $lang->testtask->build;
$config->testtask->dtable->fieldList['buildName']['type'] = 'text';
$config->testtask->dtable->fieldList['buildName']['link'] = array('module' => 'build', 'method' => 'view', 'params' => 'buildID={build}');
$config->testtask->dtable->fieldList['buildName']['data-app'] = 'execution';
$config->testtask->dtable->fieldList['buildName']['data-app'] = 'project';
$config->testtask->dtable->fieldList['buildName']['group'] = 'text';
$config->testtask->dtable->fieldList['buildName']['show'] = true;
module/testtask/js/common.ui.js
+1 -1
View File
@@ -134,7 +134,7 @@ function createBug(event)
formData.append('stepIdList', stepIdList);
var link = $.createLink('bug', 'create', $form.data('params'));
postAndLoadPage(link, formData);
postAndLoadPage(link, formData, '', {app: tab == 'my' ? 'qa' : tab});
$('#runCaseModal').closest('.modal').off('hide.zui.modal');
$('#casesResults').closest('.modal').off('hide.zui.modal');