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

Merge branch 'sprint/174_songchenxuan_45049' into 'master'

Browse Source 
Sprint/174 songchenxuan 45049

See merge request easycorp/zentaopms!643
This commit is contained in:
李玉春
2021-11-30 03:19:07 +00:00
parent ca91fc11f1 d19f60d9df
commit adb7b76f3c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+10 -10
View File
@@ -1179,7 +1179,12 @@ class bugModel extends model
*/
public function activate($bugID)
{
$oldBug = $this->getById($bugID);
$bugID = (int)$bugID;
$oldBug = $this->getById($bugID);
$solveBuild = $this->dao->select('id')
->from(TABLE_BUILD)
->where("CONCAT(',', bugs, ',')")->like("%,{$bugID},%")
->fetch('id');
$now = helper::now();
$bug = fixer::input('post')
->setDefault('assignedTo', $oldBug->resolvedBy)
@@ -1205,17 +1210,12 @@ class bugModel extends model
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
$this->dao->update(TABLE_BUG)->set('activatedCount = activatedCount + 1')->where('id')->eq((int)$bugID)->exec();
$openedBuilds = explode(',', $oldBug->openedBuild);
if($openedBuilds)
if($solveBuild)
{
$this->loadModel('build');
foreach($openedBuilds as $openedBuild)
{
$build = $this->build->getByID($openedBuild);
if(empty($build)) continue;
$build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
$this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$openedBuild)->exec();
}
$build = $this->build->getByID($solveBuild);
$build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
$this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$solveBuild)->exec();
}
$bug->activatedCount += 1;