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

Merge branch 'sprint/183_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #18890.

See merge request easycorp/zentaopms!1607
This commit is contained in:
孙广明
2022-01-25 08:44:14 +00:00
parent 00a31730c5 644f0fe851
commit 48dc595192
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+32 -2
View File
@@ -750,6 +750,11 @@ class upgradeModel extends model
$this->execSQL($this->getUpgradeFile('16.1'));
$this->moveKanbanData();
$this->appendExec('16_1');
case '16_2':
$this->saveLogs('Execute 16_2');
$this->execSQL($this->getUpgradeFile('16.2'));
$this->addSpaceTeam();
$this->appendExec('16_2');
}
$this->deletePatch();
@@ -5372,8 +5377,8 @@ class upgradeModel extends model
}
/**
* Move kanban card data to kanbancell table.
*
* Move kanban card data to kanbancell table.
*
* @access public
* @return void
*/
@@ -5445,6 +5450,31 @@ class upgradeModel extends model
$this->dao->exec("ALTER TABLE " . TABLE_KANBANCOLUMN . " DROP COLUMN `cards`;");
}
/**
* Update kanban space team.
*
* @access public
* @return void
*/
public function updateSpaceTeam()
{
$kanbanUsers = $this->dao->select("space, CONCAT(owner, ',', team) as users") ->from(TABLE_KANBAN)->fetchAll('space');
$spaceUsers = $this->dao->select("id, CONCAT(owner, ',', team) as users")->from(TABLE_KANBANSPACE)->fetchAll('id');
foreach($kanbanUsers as $spaceID => $kanban)
{
$team = zget($spaceUsers, $spaceID)->users;
$team = $team . ',' . $kanban->users;
$team = explode(',', $team);
$team = array_filter($team);
$team = array_unique($team);
$team = implode(',', $team);
$team = trim($team, ',');
$this->dao->update(TABLE_KANBANSPACE)->set('`team`')->eq($team)->where('id')->eq($spaceID)->exec();
}
}
/**
* Adjust for bug required field.
*