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

Merge branch 'sprint/pailei2_tianshujie_19312' into 'pailei2'

Browse Source 
* Fix bug #19312.

See merge request easycorp/zentaopms!2288
This commit is contained in:
李玉春
2022-03-16 01:28:24 +00:00
parent ac86303fdc a18c511ab0
commit bb528a46fc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+6 -3
View File
@@ -1337,11 +1337,14 @@ class kanban extends control
{
if($confirm == 'no')
{
$card = $this->kanban->getCardByID($cardID);
$column = $this->dao->select('*')->from(TABLE_KANBANCOLUMN)->where('id')->eq($card->column)->fetch();
$column = $this->dao->select('t2.*')->from(TABLE_KANBANCELL)->alias('t1')
->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.column=t2.id')
->where('t1.cards')->like("%,$cardID,%")
->andWhere('t1.type')->eq('common')
->fetch();
if($column->archived or $column->deleted) return print(js::alert(sprintf($this->lang->kanbancard->confirmRestoreTip, $column->name)));
return print(js::confirm(sprintf($this->lang->kanbancard->confirmRestore, $card->name), $this->createLink('kanban', 'restoreCard', "cardID=$cardID&confirm=yes"), ''));
return print(js::confirm(sprintf($this->lang->kanbancard->confirmRestore, $column->name), $this->createLink('kanban', 'restoreCard', "cardID=$cardID&confirm=yes"), ''));
}
else
{