Merge branch 'master' of https://github.com/easysoft/zentaopms

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   = "<p>[Steps]</p><br/>";

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 = "<a class='querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'> </i>{$this->lang->testcase->bySearch}</a>";

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();

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();

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();

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();

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'));

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');
+        }
+    }
 }

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]);