Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #12802.

Browse Source
This commit is contained in:
hufangzhou
2021-08-30 11:13:53 +08:00
parent bdf1f1d7d6
commit 4141b05b7b
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
-1
View File
@@ -1716,7 +1716,6 @@ class executionModel extends model
$this->config->product->search['params']['product']['values'] = $productPairs + array('all' => $this->lang->product->allProductsOfProject);
$this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts($products);
$this->config->product->search['params']['module']['values'] = $modules;
unset($this->lang->story->statusList['draft']);
if($productType == 'normal')
{
unset($this->config->product->search['fields']['branch']);
module/story/model.php
+3 -3
View File
@@ -204,7 +204,7 @@ class storyModel extends model
->setDefault('plan,verify', '')
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', $now)
->setIF($this->post->needNotReview or $executionID > 0, 'status', 'active')
->setIF($this->post->needNotReview, 'status', 'active')
->setIF($this->post->plan > 0, 'stage', 'planned')
->setIF($this->post->estimate, 'estimate', (float)$this->post->estimate)
->setIF($executionID > 0, 'stage', 'projected')
@@ -270,7 +270,7 @@ class storyModel extends model
}
/* Project or execution linked story. */
if($executionID != 0 and $story->status != 'draft')
if($executionID != 0)
{
$this->linkStory($executionID, $this->post->product, $storyID);
if($executionID != $this->session->project) $this->linkStory($this->session->project, $this->post->product, $storyID);
@@ -1764,7 +1764,7 @@ class storyModel extends model
$stories = $this->getByList($data->storyIdList);
foreach($stories as $story)
{
if($story->status == 'closed') continue;
if(strpos('draft,closed', $story->status) !== false) continue;
$task = new stdclass();
$task->execution = $executionID;
module/story/view/view.html.php
+1 -1
View File
@@ -222,7 +222,7 @@
echo "</div>";
}
if($from == 'execution') common::printIcon('task', 'create', "execution=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
if($from == 'execution' and strpos('draft,closed', $story->status) === false) common::printIcon('task', 'create', "execution=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
echo $this->buildOperateMenu($story, 'view');