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

Merge branch 'fixbug/liumengyi_34022' into 'master'

Browse Source 
* Fix bug #34022, #34028.

See merge request easycorp/zentaopms!7446
This commit is contained in:
王怡栋
2023-04-18 02:41:41 +00:00
parent 29f2ba65e3 13ce2a32b3
commit af4d04889c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+3 -2
View File
@@ -827,6 +827,7 @@ class bugModel extends model
/* Process the data if the value is 'ditto'. */
foreach($bugIDList as $bugID)
{
if(!isset($data->assignedTos[$bugID])) $data->assignedTos[$bugID] = 'closed';
if($data->types[$bugID] == 'ditto') $data->types[$bugID] = isset($prev['type']) ? $prev['type'] : '';
if($data->severities[$bugID] == 'ditto') $data->severities[$bugID] = isset($prev['severity']) ? $prev['severity'] : 3;
if($data->pris[$bugID] == 'ditto') $data->pris[$bugID] = isset($prev['pri']) ? $prev['pri'] : 0;
@@ -869,7 +870,7 @@ class bugModel extends model
$bug->plan = empty($data->plans[$bugID]) ? 0 : $data->plans[$bugID];
$bug->branch = empty($data->branches[$bugID]) ? 0 : $data->branches[$bugID];
$bug->module = $data->modules[$bugID];
$bug->assignedTo = $bug->status == 'closed' ? $oldBug->assignedTo : $data->assignedTos[$bugID];
$bug->assignedTo = $oldBug->status == 'closed' ? $oldBug->assignedTo : $data->assignedTos[$bugID];
$bug->deadline = $data->deadlines[$bugID];
$bug->resolvedBy = $data->resolvedBys[$bugID];
$bug->keywords = $data->keywords[$bugID];
@@ -929,7 +930,7 @@ class bugModel extends model
if(!dao::isError())
{
if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID);
if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bug);
$this->executeHooks($bugID);