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

Merge branch '15.6' into sprint/167_wangyidong

Browse Source
This commit is contained in:
王怡栋
2021-10-18 08:44:13 +08:00
parent d4c32965e2 21ad4ecf0a
commit 68cd0eb2f9
241 changed files with 3408 additions and 1224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/productissue.php
+4 -5
View File
@@ -124,22 +124,21 @@ class productIssueEntry extends entry
/* Get all users in issues so that we can get user detail later in batch. */
$accountList = array();
foreach($issue->assignedTo as $user) $accountList[] = $user;
foreach($issue->assignedTo as $account) $accountList[] = $account;
$accountList[] = $issue->openedBy;
$accountList = array_unique($accountList);
$profileList = $this->loadModel('user')->getUserDetailsForAPI($accountList);
/* Set the user detail to assignedTo and openedBy. */
foreach($issue->assignedTo as $key => $user)
foreach($issue->assignedTo as $key => $account)
{
/* $key can be 'closed' in some case, so here should be process it. */
if($key == 'closed')
if($account == 'closed')
{
$issue->assignedTo = array();
break;
}
$issue->assignedTo[$key] = $profileList[$user];
$issue->assignedTo[$key] = $profileList[$account];
}
$issue->openedBy = $profileList[$issue->openedBy];
api/v1/entries/productissues.php
+9 -7
View File
@@ -92,8 +92,12 @@ class productIssuesEntry extends entry
$taskTypeMap = array_flip($this->app->lang->task->typeList);
$bugTypeMap = array_flip($this->app->lang->bug->typeList);
$allValidLabels = array_merge(array_keys(array_merge($storyTypeMap, $taskTypeMap, $bugTypeMap)), array($this->app->lang->story->common, $this->app->lang->task->common, $this->app->lang->bug->common));
foreach($labels as $label)
{
/* Return empty result if label is not exists.*/
if(!in_array($label, $allValidLabels)) $this->send(200, array('page' => $page, 'total' => 0, 'limit' => $limit, 'issues' => array()));
if($label == $this->app->lang->story->common) $storyFilter[] = 'all';
if(isset($storyTypeMap[$label])) $storyFilter[] = $storyTypeMap[$label];
@@ -239,7 +243,6 @@ class productIssuesEntry extends entry
$r->assignedTo = array($task->assignedTo);
}
}
}
elseif($issue['type'] == 'story')
{
@@ -300,9 +303,9 @@ class productIssuesEntry extends entry
$userList = array();
foreach($result as $issue)
{
foreach($issue->assignedTo as $user)
foreach($issue->assignedTo as $account)
{
$userList[] = $user;
$userList[] = $account;
}
$userList[] = $issue->openedBy;
}
@@ -315,15 +318,14 @@ class productIssuesEntry extends entry
*/
foreach($result as $issue)
{
foreach($issue->assignedTo as $key => $user)
foreach($issue->assignedTo as $key => $account)
{
/* $key can be 'closed' in some case, so here should be process it. */
if($key == 'closed')
if($account == 'closed')
{
$issue->assignedTo = array();
break;
}
$issue->assignedTo[$key] = $userDetails[$user];
$issue->assignedTo[$key] = $userDetails[$account];
}
$issue->openedBy = $userDetails[$issue->openedBy];
}