diff --git a/module/block/view/waterfallprogressblock.html.php b/module/block/view/waterfallprogressblock.html.php index 39441b481a..eda1229c69 100644 --- a/module/block/view/waterfallprogressblock.html.php +++ b/module/block/view/waterfallprogressblock.html.php @@ -12,7 +12,7 @@ -
project->workHour})";?>
+
execution->workHour})";?>
PV EV diff --git a/module/block/view/waterfallreportblock.html.php b/module/block/view/waterfallreportblock.html.php index 3b08e3bc4b..dfbd693309 100644 --- a/module/block/view/waterfallreportblock.html.php +++ b/module/block/view/waterfallreportblock.html.php @@ -16,7 +16,7 @@
-

program->PGMProgress;?>

+

project->progress;?>

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 9d676b9a5c..1e7f6087ef 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -216,9 +216,7 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang-> $lang->waterfall->menu = new stdclass(); $lang->waterfall->menu->index = array('link' => "$lang->dashboard|project|index|project=%s"); $lang->waterfall->menu->programplan = array('link' => "{$lang->productplan->shortCommon}|programplan|browse|project=%s", 'subModule' => 'programplan'); -$lang->waterfall->menu->execution = array('link' => "$lang->executionCommon|execution|all|status=all&projectID=%s", 'subModule' => ',project,task,'); $lang->waterfall->menu->doc = array('link' => "{$lang->doc->common}|doc|index|project=%s"); -$lang->waterfall->menu->weekly = array('link' => "{$lang->project->report}|weekly|index|project=%s", 'subModule' => ',milestone,'); $lang->waterfall->menu->story = array('link' => "$lang->SRCommon|projectstory|story|project=%s", 'subModule' => 'projectstory'); $lang->waterfall->menu->design = array('link' => "$lang->design|design|browse|product=0&project=%s"); $lang->waterfall->menu->repo = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); @@ -233,7 +231,6 @@ $lang->waterfall->menu->settings = array('link' => "$lang->settings|project|v /* Waterfall menu order. */ $lang->waterfall->menuOrder[5] = 'index'; $lang->waterfall->menuOrder[15] = 'programplan'; -$lang->waterfall->menuOrder[10] = 'execution'; $lang->waterfall->menuOrder[20] = 'projectstory'; $lang->waterfall->menuOrder[25] = 'design'; $lang->waterfall->menuOrder[30] = 'ci'; @@ -272,7 +269,6 @@ $lang->execution->menu->qa = array('link' => "{$lang->qa->common}|executio $lang->execution->menu->repo = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); $lang->execution->menu->doc = array('link' => "{$lang->doc->common}|doc|objectLibs|type=execution&objectID=%s", 'subModule' => 'doc'); $lang->execution->menu->build = array('link' => "{$lang->build->common}|execution|build|executionID=%s", 'subModule' => 'build'); -$lang->execution->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|projectID=0&executionID=%s", 'subModule' => 'projectrelease'); $lang->execution->menu->action = array('link' => "$lang->dynamic|execution|dynamic|executionID=%s"); $lang->execution->menu->settings = array('link' => "$lang->settings|execution|view|executionID=%s", 'subModule' => 'personnel', 'alias' => 'edit,manageproducts,team,whitelist,addwhitelist,managemembers', 'class' => 'dropdown dropdown-hover'); diff --git a/module/index/js/index.js b/module/index/js/index.js index cfee91f59e..fd235da64f 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -344,6 +344,9 @@ app.$app.remove(); app.$bar.remove(); delete openedApps[appCode]; + + var firstClass = $("#bars li:first").attr('class'); + if(firstClass == 'divider') $("#bars li.divider:first").remove(); } /** diff --git a/module/project/control.php b/module/project/control.php index 4cbd536876..aadfcec5f2 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -277,15 +277,15 @@ class project extends control if($model == 'waterfall') { $productID = $this->loadModel('product')->getProductIDByProject($projectID, true); - $this->session->set('projectPlanList', $this->createLink('projectplan', 'browse', "projectID=$projectID&productID=$productID&type=lists", '', '', $projectID)); - $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('projectplan', 'create', "projectID=$projectID", '', '', $projectID))); + $this->session->set('programPlanList', $this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=lists", '', '', $projectID)); + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('programplan', 'create', "projectID=$projectID", '', '', $projectID))); } $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('project', 'create', '', '', '', $projectID))); } } - if($programID) $this->program->setMenu($programID); + if($programID) $this->loadModel('program')->setMenu($programID); $name = ''; $code = ''; @@ -722,7 +722,7 @@ class project extends control /* Build the search form. */ $actionURL = $this->createLink('project', 'bug', "projectID=$projectID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID"); - $this->execution->buildBugSearchForm($products, $queryID, $actionURL); + $this->loadModel('execution')->buildBugSearchForm($products, $queryID, $actionURL); /* Assign. */ $this->view->title = $title; diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php index 5d7c1ffe5c..56511a3d7f 100644 --- a/module/project/view/createguide.html.php +++ b/module/project/view/createguide.html.php @@ -18,14 +18,14 @@
- createLink("project", "create", "model=scrum&projectID=$projectID&from=$from"), "", '', $group)?> + createLink("project", "create", "model=scrum&projectID=$projectID"), "", '', $group)?>

project->scrum; ?>

project->scrumTitle; ?>

- createLink("project", "create", "model=waterfall&projectID=$projectID&from=$from"), "", '', $group)?> + createLink("project", "create", "model=waterfall&projectID=$projectID"), "", '', $group)?>

project->waterfall; ?>

project->waterfallTitle; ?>

diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index 1185169991..1fb3a86825 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -67,7 +67,7 @@ class projectrelease extends control */ public function browse($projectID = 0, $executionID = 0, $type = 'all') { - $this->session->set('releaseList', $this->app->getURI(true)); + $this->session->set('releaseList', $this->app->getURI(true), 'project'); $project = $this->project->getById($projectID); $execution = $this->loadModel('execution')->getById($executionID); @@ -93,11 +93,10 @@ class projectrelease extends control * Create a release. * * @param int $projectID - * @param int $executionID * @access public * @return void */ - public function create($projectID, $executionID = 0) + public function create($projectID) { $this->app->loadConfig('release'); $this->config->projectrelease->create = $this->config->release->create; @@ -120,8 +119,7 @@ class projectrelease extends control foreach($releaseBuilds as $build) unset($builds[$build]); unset($builds['trunk']); - if($projectID) $this->project->setMenu($projectID); - if($executionID) $this->loadModel('execution')->setMenu($executionID); + $this->project->setMenu($projectID); $this->commonAction(); $this->view->title = $this->view->project->name . $this->lang->colon . $this->lang->release->create; @@ -167,6 +165,9 @@ class projectrelease extends control $this->commonAction($release->product, $release->branch); $build = $this->build->getById($release->build); + /* Set project menu. */ + $this->project->setMenu($release->project); + $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->edit; $this->view->position[] = $this->lang->release->edit; $this->view->release = $release; @@ -191,8 +192,8 @@ class projectrelease extends control */ public function view($releaseID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1) { - if($type == 'story') $this->session->set('storyList', $this->app->getURI(true)); - if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $this->app->getURI(true)); + if($type == 'story') $this->session->set('storyList', $this->app->getURI(true), 'product'); + if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $this->app->getURI(true), 'qa'); $this->loadModel('story'); $this->loadModel('bug'); @@ -428,7 +429,7 @@ class projectrelease extends control $this->projectrelease->linkStory($releaseID); die(js::locate(inlink('view', "releaseID=$releaseID&type=story"), 'parent')); } - $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true¶m=" . helper::safe64Encode("&browseType=$browseType&queryID=$param"))); + $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true¶m=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'product'); $release = $this->projectrelease->getByID($releaseID); $build = $this->loadModel('build')->getByID($release->build); @@ -548,7 +549,7 @@ class projectrelease extends control die(js::locate(inlink('view', "releaseID=$releaseID&type=$type"), 'parent')); } - $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true¶m=" . helper::safe64Encode("&browseType=$browseType&queryID=$param"))); + $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true¶m=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa'); /* Set menu. */ $release = $this->projectrelease->getByID($releaseID); $build = $this->loadModel('build')->getByID($release->build); diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php index 74e3026c60..46cbeab9e3 100644 --- a/module/projectrelease/view/browse.html.php +++ b/module/projectrelease/view/browse.html.php @@ -23,7 +23,7 @@
- {$lang->release->create}", '', "class='btn btn-primary'");?> + {$lang->release->create}", '', "class='btn btn-primary'");?>
@@ -33,7 +33,7 @@

release->noRelease;?> - createLink('projectrelease', 'create', "projectID=$projectID&executionID=$executionID"), " " . $lang->release->create, '', "class='btn btn-info'");?> + createLink('projectrelease', 'create', "projectID=$projectID"), " " . $lang->release->create, '', "class='btn btn-info'");?>

diff --git a/module/story/control.php b/module/story/control.php index a486e1d6f8..3eb99f7034 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1459,6 +1459,7 @@ class story extends control { $this->session->set('storyList', $this->app->getURI(true), 'product'); $products = $this->product->getPairs(); + if(empty($productID)) $productID = key($products); $this->loadModel('testcase'); if($this->app->openApp == 'project') @@ -1466,6 +1467,8 @@ class story extends control $this->loadModel('project')->setMenu($this->session->project); $this->app->rawModule = 'qa'; $this->lang->project->menu->qa['subMenu']->testcase['subModule'] = 'story'; + $products = $this->project->getProducts($this->session->project, false); + $this->lang->modulePageNav = $this->product->select($products, $productID, 'story', 'zeroCase'); } else { diff --git a/module/testcase/control.php b/module/testcase/control.php index b730a74a07..127b20b535 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -191,6 +191,13 @@ class testcase extends control $this->app->loadLang('testtask'); $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch); + if($this->app->openApp == 'project') + { + $products = array('0' => $this->lang->product->all) + $this->project->getProducts($this->session->project, false); + $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'groupCase', '', $branch); + } + + $this->session->set('caseList', $this->app->getURI(true), 'qa'); $cases = $this->testcase->getModuleCases($productID, $branch, 0, $groupBy); diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 65ae2c7f61..ba3d57b110 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -24,6 +24,11 @@ js::set('productID', $productID); js::set('branch', $branch); js::set('suiteID', $suiteID); ?> +app->openApp == 'project'): ?> + +