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

* Remove bad comments and rename user to account.

Browse Source
This commit is contained in:
dingguodong
2021-09-24 16:39:32 +08:00
parent 9c8a10c5b6
commit c9eee62003
2 changed files with 9 additions and 11 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)
{
/* $user can be 'closed' in some case, so here should be process it. */
if($user == '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
+5 -6
View File
@@ -303,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;
}
@@ -318,15 +318,14 @@ class productIssuesEntry extends entry
*/
foreach($result as $issue)
{
foreach($issue->assignedTo as $key => $user)
foreach($issue->assignedTo as $key => $account)
{
/* $user can be 'closed' in some case, so here should be process it. */
if($user == 'closed')
if($account == 'closed')
{
$issue->assignedTo = array();
break;
}
$issue->assignedTo[$key] = $userDetails[$user];
$issue->assignedTo[$key] = $userDetails[$account];
}
$issue->openedBy = $userDetails[$issue->openedBy];
}