|
diff --git a/module/product/model.php b/module/product/model.php
index c5be2b6ca6..eda1a50f8a 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -302,7 +302,7 @@ class productModel extends model
* @access public
* @return array
*/
- public function getProducts($projectID, $status = 'all', $orderBy = '')
+ public function getProducts($projectID = 0, $status = 'all', $orderBy = '')
{
return $this->dao->select('t1.branch, t1.plan, t2.*')
->from(TABLE_PROJECTPRODUCT)->alias('t1')
diff --git a/module/story/model.php b/module/story/model.php
index 7147f2b1b7..9a357c5a5e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2189,21 +2189,21 @@ class storyModel extends model
*/
public function getBySearch($productID, $branch = 0, $queryID, $orderBy, $executionID = '', $type = 'story', $excludeStories = '', $pager = null)
{
- if($executionID != '')
+ if(!empty($executionID))
{
$products = $this->loadModel('project')->getProducts($executionID);
}
else
{
- $products = $this->loadModel('product')->getPairs();
+ $products = $this->loadModel('product')->getProducts();
}
$query = $queryID ? $this->loadModel('search')->getQuery($queryID) : '';
/* Get the sql and form status from the query. */
if($query)
{
- $this->session->set('storyQuery', $query->sql);
- $this->session->set('storyForm', $query->form);
+ $this->session->set('storyQuery', $query->sql, $this->app->openApp);
+ $this->session->set('storyForm', $query->form, $this->app->openApp);
}
if($this->session->storyQuery == false) $this->session->set('storyQuery', ' 1 = 1');
From 0870a7c49083ab36b1b0382fcf22f7ff7484dbf9 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 25 Mar 2021 11:35:55 +0800
Subject: [PATCH 2/3] * Fix details.
---
module/common/lang/menu.php | 19 ++++++++++++-------
module/project/model.php | 5 ++++-
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 1c2181e738..2ef8dc081e 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -217,11 +217,10 @@ $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->doc = array('link' => "{$lang->doc->common}|doc|index|project=%s");
+$lang->waterfall->menu->doc = array('link' => "{$lang->doc->common}|doc|objectLibs|type=project&objectID=%s");
$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->design = array('link' => "$lang->design|design|browse|product=%s");
$lang->waterfall->menu->repo = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo');
-$lang->waterfall->menu->track = array('link' => "$lang->track|projectstory|track", 'alias' => 'track');
$lang->waterfall->menu->qa = array('link' => "{$lang->qa->common}|project|qa|projectID=%s", 'subModule' => 'testcase,testtask,bug', 'alias' => 'bug,testtask,testcase');
$lang->waterfall->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse", 'subModule' => 'projectrelease');
$lang->waterfall->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s");
@@ -247,11 +246,17 @@ $lang->waterfall->menuOrder[65] = 'other';
$lang->waterfall->menuOrder[68] = 'dynamic';
$lang->waterfall->menuOrder[70] = 'projectsetting';
+$lang->waterfall->menu->qa['subMenu'] = new stdclass();
+$lang->waterfall->menu->qa['subMenu']->index = array('link' => "$lang->dashboard|project|qa|projectID=%s");
+$lang->waterfall->menu->qa['subMenu']->bug = array('link' => "{$lang->bug->common}|project|bug|projectID=%s", 'subModule' => 'bug');
+$lang->waterfall->menu->qa['subMenu']->testcase = array('link' => "{$lang->testcase->shortCommon}|project|testcase|projectID=%s", 'subModule' => 'testsuite,testcase,caselib');
+$lang->waterfall->menu->qa['subMenu']->testtask = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
+
$lang->waterfall->menu->other['dropMenu'] = new stdclass();
-$lang->waterfall->menu->other['dropMenu']->estimation = array('link' => "$lang->estimation|workestimation|index|program=%s", 'subModule' => 'workestimation,durationestimation,budget');
-$lang->waterfall->menu->other['dropMenu']->issue = array('link' => "$lang->issue|issue|browse|", 'subModule' => 'issue');
-$lang->waterfall->menu->other['dropMenu']->risk = array('link' => "$lang->risk|risk|browse|", 'subModule' => 'risk');
-$lang->waterfall->menu->other['dropMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|", 'subModule' => 'stakeholder');
+$lang->waterfall->menu->other['dropMenu']->estimation = array('link' => "$lang->estimation|workestimation|index|projectID=%s", 'subModule' => 'workestimation,durationestimation,budget');
+$lang->waterfall->menu->other['dropMenu']->issue = array('link' => "$lang->issue|issue|browse|projectID=%s", 'subModule' => 'issue');
+$lang->waterfall->menu->other['dropMenu']->risk = array('link' => "$lang->risk|risk|browse|projectID=%s", 'subModule' => 'risk');
+$lang->waterfall->menu->other['dropMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|projectID=%s", 'subModule' => 'stakeholder');
$lang->waterfall->menu->settings = $lang->scrum->menu->settings;
diff --git a/module/project/model.php b/module/project/model.php
index 13d4cf924f..424efc8225 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -628,7 +628,7 @@ class projectModel extends model
}
krsort($projectMenu);
- $projectMenu = implode('', $projectMenu);
+ $projectMenu = array_pop($projectMenu);
$lastMenu = "\n";
return $lastMenu;
@@ -1600,9 +1600,12 @@ class projectModel extends model
$this->lang->project->menu = $this->lang->{$project->model}->menu;
$this->lang->project->menuOrder = $this->lang->{$project->model}->menuOrder;
+ $moduleName = $this->app->getModuleName();
+ $methodName = $this->app->getMethodName();
foreach($this->lang->project->menu as $key => $menu)
{
if(!isset($this->lang->project->menu->{$key}['dropMenu'])) continue;
+ $projectSubMenu = $this->lang->project->menu->{$key}['dropMenu'];
$dropMenu = common::createDropMenu($this->lang->project->menu->{$key}['dropMenu'], $objectID);
if(!empty($dropMenu))
{
From 49d78a2bfb99101058cd6828bb94d215897cb163 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 25 Mar 2021 11:38:45 +0800
Subject: [PATCH 3/3] * Fix bug.
---
module/block/control.php | 1 +
module/build/control.php | 19 +++++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/module/block/control.php b/module/block/control.php
index ac087c5e62..b15959a9c6 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -679,6 +679,7 @@ class block extends control
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.execution=t5.project')
->where('t1.deleted')->eq('0')
->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
+ ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
->andWhere('t1.product = t5.product')
->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi()
->orderBy('t1.id desc')
diff --git a/module/build/control.php b/module/build/control.php
index 1b1b113b51..780a6f25a1 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -27,6 +27,10 @@ class build extends control
if(!empty($_POST))
{
+ $executionID = empty($executionID) ? $this->post->execution : $executionID;
+ if(empty($executionID)) dao::$errors['execution'] = $this->lang->build->emptyExecution;
+ if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
$buildID = $this->build->create($executionID);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->loadModel('action')->create('build', $buildID, 'opened');
@@ -42,7 +46,7 @@ class build extends control
{
$this->loadModel('project')->setMenu($projectID);
$executions = $this->execution->getPairs($projectID);
- $executionID = $executionID == 0 ? key($executions) : $executionID;
+ $executionID = empty($executionID) ? key($executions) : $executionID;
$this->session->set('project', $projectID);
}
elseif($this->app->openApp == 'execution')
@@ -113,7 +117,7 @@ class build extends control
}
elseif($this->app->openApp == 'exectuion')
{
- $this->execution->setMenu($this->execution->getPairs($build->project), $build->execution);
+ $this->execution->setMenu($build->execution);
}
/* Get stories and bugs. */
@@ -410,10 +414,12 @@ class build extends control
die(js::locate(inlink('view', "buildID=$buildID&type=story"), 'parent'));
}
- $this->session->set('storyList', inlink('view', "buildID=$buildID&type=story&link=true¶m=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+ $this->session->set('storyList', inlink('view', "buildID=$buildID&type=story&link=true¶m=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'product');
+
$build = $this->build->getById($buildID);
$product = $this->loadModel('product')->getById($build->product);
- $this->loadModel('execution')->setMenu($this->execution->getPairs($build->project), $build->execution);
+
+ $this->loadModel('execution')->setMenu($build->execution);
$this->loadModel('story');
$this->loadModel('tree');
$this->loadModel('product');
@@ -429,9 +435,10 @@ class build extends control
$this->config->product->search['actionURL'] = $this->createLink('build', 'view', "buildID=$buildID&type=story&link=true¶m=" . helper::safe64Encode("&browseType=bySearch&queryID=myQueryID"));
$this->config->product->search['queryID'] = $queryID;
$this->config->product->search['style'] = 'simple';
- $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
- $this->config->product->search['params']['module']['values'] = $this->tree->getOptionMenu($build->product, $viewType = 'story', $startModuleID = 0);
+ $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
+ $this->config->product->search['params']['module']['values'] = $this->tree->getOptionMenu($build->product, 'story', 0);
$this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
+
if($product->type == 'normal')
{
unset($this->config->product->search['fields']['branch']);
|