diff --git a/extension/lite/block/ext/config/lite.php b/extension/lite/block/ext/config/lite.php index 3e73f52a81..f944493416 100644 --- a/extension/lite/block/ext/config/lite.php +++ b/extension/lite/block/ext/config/lite.php @@ -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']); diff --git a/extension/lite/block/ext/lang/de/lite.php b/extension/lite/block/ext/lang/de/lite.php index 3aa8e55a79..5d8ade3ba9 100644 --- a/extension/lite/block/ext/lang/de/lite.php +++ b/extension/lite/block/ext/lang/de/lite.php @@ -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(); diff --git a/extension/lite/block/ext/lang/en/lite.php b/extension/lite/block/ext/lang/en/lite.php index 3aa8e55a79..5d8ade3ba9 100644 --- a/extension/lite/block/ext/lang/en/lite.php +++ b/extension/lite/block/ext/lang/en/lite.php @@ -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(); diff --git a/extension/lite/block/ext/lang/fr/lite.php b/extension/lite/block/ext/lang/fr/lite.php index 3aa8e55a79..5d8ade3ba9 100644 --- a/extension/lite/block/ext/lang/fr/lite.php +++ b/extension/lite/block/ext/lang/fr/lite.php @@ -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(); diff --git a/extension/lite/block/ext/lang/zh-cn/lite.php b/extension/lite/block/ext/lang/zh-cn/lite.php index c92e0fd95f..87adb7f807 100644 --- a/extension/lite/block/ext/lang/zh-cn/lite.php +++ b/extension/lite/block/ext/lang/zh-cn/lite.php @@ -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(); diff --git a/module/testreport/control.php b/module/testreport/control.php index 20b1b3de32..ddc8707437 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -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'); diff --git a/module/testtask/config/table.php b/module/testtask/config/table.php index 6144f6771d..35f705c4d8 100644 --- a/module/testtask/config/table.php +++ b/module/testtask/config/table.php @@ -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; diff --git a/module/testtask/js/common.ui.js b/module/testtask/js/common.ui.js index e2c21f5a54..9e7bb15371 100644 --- a/module/testtask/js/common.ui.js +++ b/module/testtask/js/common.ui.js @@ -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');