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

Merge branch 'master_xieqiyu_26779' into 'master'

Browse Source 
Master xieqiyu 26779

See merge request easycorp/zentaopms!5159
This commit is contained in:
王怡栋
2022-08-29 00:49:03 +00:00
parent 5d8309b24a e00f756381
commit 8a22b73e0e
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/productissue.php
+1 -1
View File
@@ -34,7 +34,7 @@ class productIssueEntry extends entry
{
case 'story':
$this->app->loadLang('story');
$storyStatus = array('' => '', 'draft' => 'opened', 'active' => 'opened', 'changed' => 'opened', 'closed' => 'closed');
$storyStatus = array('' => '', 'draft' => 'opened', 'reviewing' => 'opened', 'active' => 'opened', 'changing' => 'opened', 'closed' => 'closed');
$story = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($id)->fetch();
if(!$story) $this->send404();
api/v1/entries/productissues.php
+1 -1
View File
@@ -30,7 +30,7 @@ class productIssuesEntry extends entry
$storyFields = 'id,status';
$storyStatus = array('' => '');
$storyStatus['opened'] = 'draft,active,changed';
$storyStatus['opened'] = 'draft,reviewing,active,changing';
$storyStatus['closed'] = 'closed';
$bugFields = 'id,status';
api/v1/entries/reports.php
+1 -1
View File
@@ -273,7 +273,7 @@ class reportsEntry extends entry
}
/* Set story status statistics integrate into product. */
$storyStatusList = array('draft' => array(), 'active' => array(), 'changed' => array(), 'closed' => array());
$storyStatusList = array('draft' => array(), 'reviewing' => array(), 'active' => array(), 'changing' => array(), 'closed' => array());
foreach($processedProducts as $productID => $product)
{
$product->storyStat = array();
module/story/control.php
+1 -1
View File
@@ -1878,7 +1878,7 @@ class story extends control
$storyGroup = array();
foreach($stories as $story)
{
if(strpos('draft,closed', $story->status) !== false) continue;
if(strpos('draft,reviewing,changing,closed', $story->status) !== false) continue;
if(isset($storyGroup[$story->module])) continue;
$storyGroup[$story->module] = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $story->module, 'short', 'active');
}
module/story/model.php
+1 -1
View File
@@ -3010,7 +3010,7 @@ class storyModel extends model
if($excludeStories) $storyQuery = $storyQuery . ' AND `id` NOT ' . helper::dbIN($excludeStories);
if($this->app->moduleName == 'productplan') $storyQuery .= " AND `status` NOT IN ('closed') AND `parent` >= 0 ";
$allBranch = "`branch` = 'all'";
if($executionID != '')
if(!empty($executionID))
{
$normalProducts = array();
$branchProducts = array();