diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index d778155281..05f37f3075 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -177,7 +177,7 @@ $lang->bug->confirmChangeProduct = "Any change to {$lang->productCommon} will c $lang->bug->confirmDelete = 'Do you want to delete this bug?'; $lang->bug->remindTask = 'This bug has been converted to a task. Do you want to update the status of Task(ID %s)?'; $lang->bug->skipClose = 'Bug %s is active. You cannot close it.'; -$lang->bug->projectAccessDenied = "You access to the {$this->projectCommon} to which this bug belongs is denied!"; +$lang->bug->projectAccessDenied = "You access to the {$lang->projectCommon} to which this bug belongs is denied!"; /* Template. */ $lang->bug->tplStep = "

[Steps]


"; diff --git a/module/caselib/model.php b/module/caselib/model.php index 2e2505c81a..4ae71be856 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -118,8 +118,7 @@ class caselibModel extends model $this->lang->modulePageActions = $pageActions; foreach($this->lang->caselib->menu as $key => $value) { - $replace = ''; - if($this->config->global->flow == 'onlyTest') $replace = $libID; + $replace = $libID; common::setMenuVars($this->lang->caselib->menu, $key, $replace); } if($this->config->global->flow != 'full' && $this->app->getMethodName() != 'view') $this->lang->caselib->menu->bysearch = " {$this->lang->testcase->bySearch}"; diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 6c732b410e..54635d137f 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -328,7 +328,7 @@ $lang->caselib->menu->testcase = array('link' => 'Fälle|testcase|browse|'); $lang->caselib->menu->testtask = array('link' => 'Build|testtask|browse|'); $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Berichte|testreport|browse|'); -$lang->caselib->menu->caselib = array('link' => 'Bibliothek|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->menu->caselib = array('link' => 'Bibliothek|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); /* 文档视图菜单设置。*/ $lang->doc = new stdclass(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 24e3c3ffc5..dd199dfb9c 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -328,7 +328,7 @@ $lang->caselib->menu->testcase = array('link' => 'Case|testcase|browse|'); $lang->caselib->menu->testtask = array('link' => 'Request|testtask|browse|'); $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Report|testreport|browse|'); -$lang->caselib->menu->caselib = array('link' => 'Case Library|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->menu->caselib = array('link' => 'Case Library|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); /* Doc menu settings. */ $lang->doc = new stdclass(); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 26dc00f42d..2bbec66681 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -328,7 +328,7 @@ $lang->caselib->menu->testcase = array('link' => 'CasTest|testcase|browse|'); $lang->caselib->menu->testtask = array('link' => 'Recette|testtask|browse|'); $lang->caselib->menu->testsuite = array('link' => 'Cahier Recette|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Rapport|testreport|browse|'); -$lang->caselib->menu->caselib = array('link' => 'Library Recette|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->menu->caselib = array('link' => 'Library Recette|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); /* Doc menu settings. */ $lang->doc = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d444757845..af7f5d4a44 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -330,7 +330,7 @@ $lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|'); $lang->caselib->menu->testtask = array('link' => '测试单|testtask|browse|'); $lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|'); $lang->caselib->menu->report = array('link' => '报告|testreport|browse|'); -$lang->caselib->menu->caselib = array('link' => '用例库|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->menu->caselib = array('link' => '用例库|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); $lang->repo = new stdclass(); $lang->repo->menu = new stdclass(); diff --git a/module/project/control.php b/module/project/control.php index 8b3c066452..1a4846a4a3 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1788,6 +1788,7 @@ class project extends control { $this->project->delete(TABLE_PROJECT, $projectID); $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec(); + $this->project->updateUserView($projectID); $this->session->set('project', ''); $this->executeHooks($projectID); die(js::locate(inlink('index'), 'parent')); diff --git a/module/project/model.php b/module/project/model.php index 309e490541..165227e7a2 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2953,4 +2953,21 @@ class projectModel extends model } return $html; } + + /** + * Update user view of project and it's product. + * + * @param int $project + * @access public + * @return void + */ + public function updateUserView($project) + { + $this->loadModel('user')->updateUserView($projectID, 'project'); + $products = $this->getProducts($project, $withBranch = false); + if(!empty($products)) + { + foreach($products as $productID => $productName) $this->loadModel('user')->updateUserView($productID, 'product'); + } + } } diff --git a/module/testcase/control.php b/module/testcase/control.php index 803ab9b11b..a3c43cbc25 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -500,7 +500,7 @@ class testcase extends control { $libraries = $this->loadModel('caselib')->getLibraries(); $this->caselib->setLibMenu($libraries, $case->lib); - $this->lang->testcase->menu = $this->lang->testsuite->menu; + $this->lang->testcase->menu = $this->lang->caselib->menu; $this->view->title = "CASE #$case->id $case->title - " . $libraries[$case->lib]; $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$case->lib"), $libraries[$case->lib]);