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

* Merge #ffd2b525c8,Change judgment condition.

Browse Source
This commit is contained in:
tanghucheng
2023-11-08 22:17:40 -05:00
parent 6c1fba1df3
commit 624d748ba4
11 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+2 -2
View File
@@ -434,7 +434,7 @@ class bugModel extends model
if($changes) $this->action->logHistory($actionID, $changes);
/* If the edition is not pms, update feedback. */
if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status);
if($this->config->edition != 'open' && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status);
return !dao::isError();
}
@@ -559,7 +559,7 @@ class bugModel extends model
$this->dao->update(TABLE_BUG)->data($bug, 'comment')->autoCheck()->checkFlow()->where('id')->eq($bug->id)->exec();
if(dao::isError()) return false;
if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status);
if($this->config->edition != 'open' && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status);
$changes = common::createChanges($oldBug, $bug);
$actionID = $this->loadModel('action')->create('bug', $bug->id, 'Closed', $bug->comment);