diff --git a/framework/router.class.php b/framework/router.class.php index bd58a3c360..e1df5c32c8 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -206,7 +206,7 @@ class router extends baseRouter if($hourKey == STORYPOINT_KEY) $config->hourUnit = 'sp'; if($hourKey == FUNCTIONPOINT_KEY) $config->hourUnit = 'fp'; - $iterationKey = $projectKey; + $iterationKey = $projectKey; /* Set productCommon, projectCommon and hourCommon. Default english lang. */ $lang->productCommon = $this->config->productCommonList[$this->clientLang][PRODUCT_KEY]; diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 72bf974dc5..102c8cb7bf 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -177,8 +177,7 @@ class html extends baseHTML } } - $string = ''; - $string .= "\n"; /* The options. */ if(is_array($selectedItems)) $selectedItems = implode(',', $selectedItems); diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php index 341cfa2442..6d3350bd66 100644 --- a/lib/scm/gitlab.class.php +++ b/lib/scm/gitlab.class.php @@ -517,7 +517,7 @@ class gitlab if(!scm::checkRevision($version)) return array(); $api = "commits"; - if(empty($count)) $count = 1; + if(empty($count)) $count = 100; $params = array(); $params['ref_name'] = $branch; $params['per_page'] = $count; @@ -624,6 +624,7 @@ class gitlab if(count($results) < 100) break; } + $files = array(); foreach($allResults as $row) { $file = new stdclass(); diff --git a/module/backup/control.php b/module/backup/control.php index 83598bb67b..62144de15a 100644 --- a/module/backup/control.php +++ b/module/backup/control.php @@ -336,7 +336,7 @@ class backup extends control if($statusFile) { $this->app->loadLang('extension'); - $this->view->error = sprintf($this->lang->extension->noticeOkFile, preg_replace('/^' . str_replace('/', '\\/', dirname($this->app->getBasePath()) . DS) . '/', '', $statusFile)); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace(dirname($this->app->getBasePath()) . DS, '', $statusFile)); die($this->display()); } diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 0f6b469fb9..7116fe6a6c 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -127,7 +127,7 @@ $lang->typeAB = 'Type'; $lang->nameAB = 'Name'; $lang->common->common = 'Common Module'; -$lang->my->common = 'Home'; +$lang->my->common = 'My'; $lang->program->common = 'Program'; $lang->product->common = 'Product'; $lang->project->common = 'Project'; @@ -165,7 +165,7 @@ $lang->release->common = 'Release'; $lang->message->common = 'Message'; $lang->mail->common = 'Mail'; -$lang->my->shortCommon = 'Home'; +$lang->my->shortCommon = 'My'; $lang->testcase->shortCommon = 'Case'; $lang->productplan->shortCommon = 'Plan'; $lang->score->shortCommon = 'Score'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 9c66337320..1f8156bc4a 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -225,8 +225,6 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang-> /* Execution menu. */ $lang->execution->homeMenu = new stdclass(); -//if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|"; -//$lang->execution->homeMenu->list = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit'); if($config->systemMode == 'new') $lang->execution->homeMenu->executionkanban = array('link' => "{$lang->execution->executionKanban}|execution|executionkanban|"); $lang->execution->menu = new stdclass(); @@ -316,19 +314,17 @@ $lang->qa->dividerMenu = ',bug,testtask,caselib,'; /* DevOps menu. */ $lang->devops->menu = new stdclass(); -$lang->devops->menu->code = array('link' => "{$lang->repo->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccomment,showsynccommit'); +$lang->devops->menu->code = array('link' => "{$lang->repo->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccommit'); $lang->devops->menu->compile = array('link' => "{$lang->devops->compile}|job|browse", 'subModule' => 'compile,job'); $lang->devops->menu->jenkins = array('link' => "Jenkins|jenkins|browse", 'alias' => 'create,edit'); -$lang->devops->menu->gitlab = array('link' => "Gitlab|gitlab|browse", 'alias' => 'create,edit'); $lang->devops->menu->maintain = array('link' => "{$lang->devops->repo}|repo|maintain", 'alias' => 'create,edit'); $lang->devops->menu->rules = array('link' => "{$lang->devops->rules}|repo|setrules"); $lang->devops->menuOrder[5] = 'code'; $lang->devops->menuOrder[10] = 'compile'; -$lang->devops->menuOrder[15] = 'jenkins'; -$lang->devops->menuOrder[14] = 'gitlab'; -$lang->devops->menuOrder[20] = 'maintain'; -$lang->devops->menuOrder[25] = 'rules'; +$lang->devops->menuOrder[20] = 'jenkins'; +$lang->devops->menuOrder[25] = 'maintain'; +$lang->devops->menuOrder[30] = 'rules'; /* Doc menu.*/ $lang->doc->menu = new stdclass(); diff --git a/module/common/model.php b/module/common/model.php index 2505d9c363..c3adb1b9ba 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -529,7 +529,11 @@ class commonModel extends model { $nav = $lang->mainNav->$openApp; list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav); - if($openApp == 'execution') $currentMethod = 'executionKanban'; + if($openApp == 'execution') + { + if($config->systemMode == 'new') $currentMethod = 'executionKanban'; + if($config->systemMode == 'classic') $currentMethod = 'all'; + } } else { @@ -539,7 +543,7 @@ class commonModel extends model } if($config->systemMode == 'classic' and $openApp == 'execution') $icon = zget($lang->navIcons, 'project', ''); - $link = ($openApp == 'execution' and ($config->systemMode == 'classic')) ? '' : helper::createLink($currentModule, $currentMethod); + $link = helper::createLink($currentModule, $currentMethod); $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}"; echo "
" . $html . '
'; @@ -2248,7 +2252,7 @@ EOD; curl_setopt($curl, CURLOPT_POST, true); curl_setopt($curl, CURLOPT_POSTFIELDS, $data); } - + if($options) curl_setopt_array($curl, $options); $response = curl_exec($curl); $errors = curl_error($curl); diff --git a/module/execution/control.php b/module/execution/control.php index 18282ef9ab..6d37712eb2 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1411,7 +1411,7 @@ class execution extends control { $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project'); $this->loadModel('productplan')->linkProject($executionID, $_POST['plans'], $oldPlanStories); - $this->loadModel('productplan')->linkProject($projectID, $_POST['plans']); + $this->productplan->linkProject($projectID, $_POST['plans']); } $this->executeHooks($executionID); @@ -1432,7 +1432,7 @@ class execution extends control $position[] = html::a($browseExecutionLink, $execution->name); $position[] = $this->lang->execution->edit; - $allProducts = array(0 => ''); + $allProducts = array(0 => ''); $executionProsucts = $this->execution->getProducts($execution->project, true, 'noclosed'); foreach($executionProsucts as $product) $allProducts[$product->id] = $product->name; diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 25dc256f7d..a5e1c34fdd 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[ $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended']; $lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed']; -$lang->execution->myExecutions = 'Ich bin beteiligt.'; -$lang->execution->doingProject = 'Laufende Projekte'; +$lang->execution->myExecutions = 'Ich bin beteiligt.'; +$lang->execution->doingProject = 'Laufende Projekte'; + $lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended']. ' ' . $lang->execution->common; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 208f953651..25863c7dc6 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[ $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended']; $lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed']; -$lang->execution->myExecutions = 'Mine'; -$lang->execution->doingProject = 'Ongoing Projects'; +$lang->execution->myExecutions = 'Mine'; +$lang->execution->doingProject = 'Ongoing Projects'; + $lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index d0b8500415..53f323b89c 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[ $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended']; $lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed']; -$lang->execution->myExecutions = "J'étais impliqué"; -$lang->execution->doingProject = 'Projets en cours'; +$lang->execution->myExecutions = "J'étais impliqué"; +$lang->execution->doingProject = 'Projets en cours'; + $lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index 9889340e39..2a3e9ba2d5 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -406,8 +406,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[ $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended']; $lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed']; -$lang->execution->myExecutions = 'Tôi tham gia'; -$lang->execution->doingProject = 'Hiện trường'; +$lang->execution->myExecutions = 'Tôi tham gia'; +$lang->execution->doingProject = 'Hiện trường'; + $lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 29723b9af5..b1fa08e4b1 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[ $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended']; $lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed']; -$lang->execution->myExecutions = '我参与的'; -$lang->execution->doingProject = '进行中的项目'; +$lang->execution->myExecutions = '我参与的'; +$lang->execution->doingProject = '进行中的项目'; + $lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . '的' . $lang->execution->common; $lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . '的' . $lang->execution->common; $lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . '的' . $lang->execution->common; diff --git a/module/execution/model.php b/module/execution/model.php index d589bd5496..879450b729 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1575,7 +1575,7 @@ class executionModel extends model * Get products of a execution. * * @param int $executionID - * @param bool $withBranch + * @param bool $withBranch * @access public * @return array */ @@ -1739,13 +1739,13 @@ class executionModel extends model public function updateProducts($executionID, $products = '') { $this->loadModel('user'); - $products = isset($_POST['products']) ? $_POST['products'] : $products; - $oldExecutionProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchGroup('product', 'branch'); + $products = isset($_POST['products']) ? $_POST['products'] : $products; + $oldProdcuts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchGroup('product', 'branch'); $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->exec(); $members = array_keys($this->getTeamMembers($executionID)); if(empty($products)) { - $this->user->updateUserView(array_keys($oldExecutionProducts), 'product', $members); + $this->user->updateUserView(array_keys($oldProdcuts), 'product', $members); return true; } @@ -1760,10 +1760,10 @@ class executionModel extends model $oldPlan = 0; $branch = isset($branches[$i]) ? $branches[$i] : 0; - if(isset($oldExecutionProducts[$productID][$branch])) + if(isset($oldProdcuts[$productID][$branch])) { - $oldExecutionProduct = $oldExecutionProducts[$productID][$branch]; - $oldPlan = $oldExecutionProduct->plan; + $oldProdcuts= $oldProdcuts[$productID][$branch]; + $oldPlan = $oldProdcuts>plan; } $data = new stdclass(); @@ -1775,7 +1775,7 @@ class executionModel extends model $existedProducts[$productID] = true; } - $oldProductKeys = array_keys($oldExecutionProducts); + $oldProductKeys = array_keys($oldProdcuts); $needUpdate = array_merge(array_diff($oldProductKeys, $products), array_diff($products, $oldProductKeys)); if($needUpdate) $this->user->updateUserView($needUpdate, 'product', $members); } diff --git a/module/execution/view/executionkanban.html.php b/module/execution/view/executionkanban.html.php index aba62e9635..62a33e4764 100644 --- a/module/execution/view/executionkanban.html.php +++ b/module/execution/view/executionkanban.html.php @@ -27,7 +27,7 @@ - + $executionList):?> diff --git a/module/gitlab/view/importissue.html.php b/module/gitlab/view/importissue.html.php index e283eeb068..a570b38e59 100644 --- a/module/gitlab/view/importissue.html.php +++ b/module/gitlab/view/importissue.html.php @@ -18,22 +18,22 @@
- +
- - - - + + + + - - - + + + diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 6ccdb8cf83..6d34e4ef06 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -533,7 +533,6 @@ $lang->release->methodOrder[70] = 'changeStatus'; /* Execution. */ $lang->resource->execution = new stdclass(); -//$lang->resource->execution->index = 'index'; $lang->resource->execution->view = 'view'; $lang->resource->execution->browse = 'browse'; $lang->resource->execution->create = 'createExec'; @@ -1133,7 +1132,7 @@ $lang->gitlab->methodOrder[15] = 'edit'; $lang->gitlab->methodOrder[20] = 'importIssue'; $lang->gitlab->methodOrder[30] = 'delete'; $lang->gitlab->methodOrder[35] = 'bindUser'; -$lang->gitlab->methodOrder[40] = 'bindProduct'; +$lang->gitlab->methodOrder[40] = 'bindProduct'; /* Git. */ $lang->resource->git = new stdclass(); diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index 6941f737e6..c81f68765a 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -64,15 +64,16 @@ - + + diff --git a/module/message/css/setting.css b/module/message/css/setting.css index 8fa6ac8a80..0a26a1d7fe 100644 --- a/module/message/css/setting.css +++ b/module/message/css/setting.css @@ -1,5 +1,5 @@ .checkbox-primary + .checkbox-primary {margin: 0px;} -.checkbox-primary {margin: 0px; width: 120px; float:left;} +.checkbox-primary {margin: 0px; width: 120px; float: left;} .checkbox-primary label {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;} div.chosen-container + select + div.chosen-container > .chosen-choices {border-top: 0px;} diff --git a/module/product/css/all.css b/module/product/css/all.css index 6388c052cb..47c6a0af10 100644 --- a/module/product/css/all.css +++ b/module/product/css/all.css @@ -35,7 +35,8 @@ #sidebar>.cell {width: 100%;} .main-table thead>tr:first-of-type>th {border-left: 1px solid #ddd;} -th.table-nest-title .table-nest-toggle {margin-top: 8px; margin-left: 35px;} +th.table-nest-title .nest-has-checkbox {margin-top: 8px; margin-left: 35px;} +th.table-nest-title .nest-none-checkbox {margin-top: 8px; margin-left: 5px;} th.table-nest-title .header {margin-left: 5px;} th.table-nest-title .sort-up {padding-left: 5px;} th.table-nest-title .sort-down {padding-left: 5px;} diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 55a9f2a598..79bab6c722 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -41,7 +41,7 @@ config->URAndSR):?> diff --git a/module/repo/model.php b/module/repo/model.php index 77ac01b33f..3540f16975 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -638,6 +638,7 @@ class repoModel extends model { $commitID = $this->dao->lastInsertID(); if($branch) $this->dao->replace(TABLE_REPOBRANCH)->set('repo')->eq($repoID)->set('revision')->eq($commitID)->set('branch')->eq($branch)->exec(); + $file = array(); foreach($logs['files'][$i] as $file) { $parentPath = dirname($file->path); @@ -1741,32 +1742,41 @@ class repoModel extends model return $buildedURL; } - /** - * Get gitlab projects. - * - * @param string $host - * @param string $token - * @access public - * @return array - */ - public function getGitlabProjects($host, $token) - { - $host = rtrim($host, '/'); - $host .= '/api/v4/projects'; + /** + * Get gitlab projects. + * + * @param string $host + * @param string $token + * @access public + * @return array + */ + public function getGitlabProjects($host, $token) + { + $host = rtrim($host, '/'); + $host .= '/api/v4/projects'; - $allResults = array(); - for($page = 1; true; $page ++) - { - $results = json_decode(common::http($host . "?private_token=$token&simple=true&membership=true&page={$page}&per_page=100")); - if(empty($results) or $page > 10) break; - $allResults = $allResults + $results; - } + $allResults = array(); + for($page = 1; true; $page ++) + { + $results = json_decode(common::http($host . "?private_token=$token&simple=true&membership=true&page={$page}&per_page=100")); + if(empty($results) or $page > 10) break; + $allResults = $allResults + $results; + } - return $allResults; - } + return $allResults; + } + /** + * Process gitlab repo. + * + * @param oobject $repo + * @access public + * @return object + */ public function processGitlab($repo) { + return $repo; + $gitlab = $this->loadModel('gitlab')->getByID($repo->client); if(!$gitlab) return $repo; $repo->gitlab = $gitlab->id; diff --git a/module/story/model.php b/module/story/model.php index ea296e8ad0..7b3de9a339 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -170,7 +170,7 @@ class storyModel extends model { return $this->dao->select('id,title')->from(TABLE_STORY) ->where('deleted')->eq(0) - ->andWhere('status')->ne('draft') + ->andWhere('status')->notIN('draft,closed') ->andWhere('product')->eq($productID) ->andWhere('type')->eq('requirement') ->fetchPairs(); diff --git a/module/task/model.php b/module/task/model.php index 0ee01b4214..08927d7543 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -116,7 +116,7 @@ class taskModel extends model ->checkIF($task->estimate != '', 'estimate', 'float') ->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted) ->exec(); - + if(dao::isError()) return false; $taskID = $this->dao->lastInsertID(); @@ -459,9 +459,9 @@ class taskModel extends model /** * Create task from gitlab issue. - * - * @param object $task - * @param int $executionID + * + * @param object $task + * @param int $executionID * @access public * @return int */ @@ -474,18 +474,18 @@ class taskModel extends model $task->module = 0; $task->estimate = 0; $task->estStarted = '0000-00-00'; - $task->left = 1; - $task->type = 'devel'; + $task->left = 1; + $task->type = 'devel'; $this->dao->insert(TABLE_TASK)->data($task, $skip = 'id,product') ->autoCheck() ->batchCheck($this->config->task->create->requiredFields, 'notempty') ->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted) ->exec(); - + if(dao::isError()) return false; - - return $this->dao->lastInsertID(); + + return $this->dao->lastInsertID(); } /** @@ -1297,8 +1297,8 @@ class taskModel extends model if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID); if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID); $allChanges[$taskID] = common::createChanges($oldTask, $task); - - /* update task to gitlab issue. */ + + /* Update task to gitlab issue. */ $this->loadModel('gitlab'); $relation = $this->gitlab->getRelationByObject('task', $taskID); if(!empty($relation)) $this->gitlab->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task, $taskID); diff --git a/module/testcase/model.php b/module/testcase/model.php index c1cdcb0543..6ef5bbb34f 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -446,7 +446,7 @@ class testcaseModel extends model ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi() ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi() ->orderBy($sort) - ->page($pager) + ->page($pager, 't1.id') ->fetchAll(); } elseif($browseType == 'bysuite') diff --git a/module/testtask/control.php b/module/testtask/control.php index 8885e7d9a4..f6ad9b4583 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -597,6 +597,8 @@ class testtask extends control { $this->loadModel('qa')->setMenu($this->products, $productID, $branchID, $taskID); } + unset($this->lang->testtask->report->charts['bugStageGroups']); + unset($this->lang->testtask->report->charts['bugHandleGroups']); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common . $this->lang->colon . $this->lang->testtask->reportChart; $this->view->position[] = html::a($this->createLink('testtask', 'cases', "taskID=$taskID"), $this->products[$productID]); diff --git a/module/testtask/model.php b/module/testtask/model.php index 9875ca3a23..77e67e306b 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -2188,6 +2188,7 @@ class testtaskModel extends model $caseStep->type = 'step'; $caseStep->desc = ''; $caseStep->expect = $step->checkPoints[0]->expect; + $case->steps[] = $caseStep; } $result->caseResult = $stepStatus; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 44634a18e6..cf51850da9 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -687,7 +687,6 @@ class upgradeModel extends model case '15_0_3': $this->saveLogs('Execute 15_0_3'); $this->execSQL($this->getUpgradeFile('15.0.3')); - $this->processGitlabRepo(); $this->appendExec('15_0_3'); }
gitlab->gitlabIssue;?>gitlab->objectType;?>product->common;?>execution->common;?>gitlab->gitlabIssue;?>gitlab->objectType;?>product->common;?>execution->common;?>
web_url}' target='_blank'>$issue->title";?>iid}]", $objectTypes, '', "class='form-control select chosen'" );?>iid}]", $products, '', "class='form-control select chosen'" );?>iid}]", '', '', "class='form-control select chosen'" );?>iid}]", $objectTypes, '', "class='form-control'" );?>iid}]", $products, '', "class='form-control'" );?>iid}]", '', '', "class='form-control'" );?>
install->selectedMode;?>upgrade->to15Mode['classic']) ? 'classic' : 'new';?> - upgrade->to15Mode, $systemMode);?> - + upgrade->to15Mode['classic']) ? 'classic' : 'new';?> + upgrade->to15Mode, $systemMode);?> +
install->selectedModeTips;?>
-
install->importDemoData);?>
lang->selectAll}'>";?> - + ' data-expand-text='expand; ?>' data-collapse-text='collapse; ?>'> product->name);?>