diff --git a/module/execution/model.php b/module/execution/model.php index 6f2eab0f95..5e4ebdae82 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1182,6 +1182,10 @@ class executionModel extends model { $link = helper::createLink('execution', $module, "executionID=%s"); } + elseif($module == 'repo') + { + $link = helper::createLink('repo', 'browse', "repoID=0&branchID=&executionID=%s"); + } else { $link = helper::createLink($module, $method, "executionID=%s"); diff --git a/module/group/control.php b/module/group/control.php index 588e4ea9b2..1705d62172 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -256,7 +256,12 @@ class group extends control $groupUsers = $this->group->getUserPairs($groupID); $allUsers = $this->loadModel('dept')->getDeptUserPairs($deptID); $otherUsers = array_diff_assoc($allUsers, $groupUsers); - $outsideUsers = $this->user->getPairs('outside|noclosed|noletter|noempty'); + + if($this->config->systemMode == 'new') + { + $outsideUsers = $this->user->getPairs('outside|noclosed|noletter|noempty'); + $this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers); + } $title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember; $position[] = $group->name; @@ -268,7 +273,6 @@ class group extends control $this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createGroupManageMemberLink'), $groupID); $this->view->groupUsers = $groupUsers; $this->view->otherUsers = $otherUsers; - $this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers); $this->display(); } diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index 5a1cc302e0..723cf84131 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -58,6 +58,7 @@ + systemMode == 'new'):?>
@@ -71,6 +72,7 @@ + loadModel('user'); - $poUsers = $this->user->getPairs('nodeleted|pofirst', $product->PO, $this->config->maxCount); + $poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed', $product->PO, $this->config->maxCount); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink; - $qdUsers = $this->user->getPairs('nodeleted|qdfirst', $product->QD, $this->config->maxCount); + $qdUsers = $this->user->getPairs('nodeleted|qdfirst|noclosed', $product->QD, $this->config->maxCount); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink; - $rdUsers = $this->user->getPairs('nodeleted|devfirst', $product->RD, $this->config->maxCount); + $rdUsers = $this->user->getPairs('nodeleted|devfirst|noclosed', $product->RD, $this->config->maxCount); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink; $lines = array(); diff --git a/module/project/control.php b/module/project/control.php index c008174851..817cad57bc 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -173,6 +173,9 @@ class project extends control { $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram()); + if($projectID == 0 and common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'create')); + if($projectID == 0 and !common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'browse')); + $this->project->setMenu($projectID); $project = $this->project->getByID($projectID); diff --git a/module/testcase/model.php b/module/testcase/model.php index e73a87ea52..4d8bc59ec6 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -501,12 +501,14 @@ class testcaseModel extends model if($branch and strpos($caseQuery, '`branch` =') === false) $caseQuery .= " AND `branch` in('0','$branch')"; if(strpos($caseQuery, $allBranch) !== false) $caseQuery = str_replace($allBranch, '1', $caseQuery); $caseQuery .= ')'; - $caseQuery = str_replace(array('`product`', '`version`'), array('t1.`product`', 't1.`version`'), $caseQuery); + $caseQuery = str_replace('`version`', 't1.`version`', $caseQuery); if($this->app->openApp == 'project') $caseQuery = str_replace('`product`', 't2.`product`', $caseQuery); - $cases = $this->dao->select('*')->from(TABLE_CASE) - ->beginIF($this->app->openApp == 'project')->alias('t1')->fi() - ->beginIF($this->app->openApp == 'project')->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id=t2.case')->fi() + + /* Search criteria under compatible project. */ + $sql = $this->dao->select('*')->from(TABLE_CASE)->alias('t1'); + if($this->app->openApp == 'project') $sql->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id=t2.case'); + $cases = $sql ->where($caseQuery) ->beginIF($this->app->openApp == 'project')->andWhere('t2.project')->eq($this->session->project)->fi() ->beginIF(!empty($productID) and $queryProductID != 'all') diff --git a/module/testtask/model.php b/module/testtask/model.php index 93acd2e789..6d95b453e0 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1130,7 +1130,7 @@ class testtaskModel extends model /* Update testRun's status. */ if(!dao::isError()) { - $runStatus = $caseResult == 'blocked' ? 'blocked' : 'done'; + $runStatus = $caseResult == 'blocked' ? 'blocked' : 'normal'; $this->dao->update(TABLE_TESTRUN) ->set('lastRunResult')->eq($caseResult) ->set('status')->eq($runStatus) @@ -1429,7 +1429,7 @@ class testtaskModel extends model foreach(explode(',', trim($run->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '
'; break; case 'status': - echo $caseChanged ? "{$this->lang->testcase->changed}" : $this->processStatus('testtask', $run); + echo $caseChanged ? "{$this->lang->testcase->changed}" : $this->processStatus('testcase', $run); break; case 'precondition': echo $run->precondition; diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php index e6dd742c3c..39c5e9b440 100644 --- a/module/upgrade/view/to15guide.html.php +++ b/module/upgrade/view/to15guide.html.php @@ -10,14 +10,6 @@ * @link http://www.zentao.net */ ?> -maxVersion)) -{ - unset($lang->upgrade->to15Mode['classic']); - $mode = 'new'; -} -?>
@@ -26,7 +18,7 @@ if(isset($config->maxVersion))
upgrade->to15Desc;?> - upgrade->to15Mode, $mode);?> + upgrade->to15Mode, 'classic');?>

upgrade->selectedModeTips['classic'];?>