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

Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

Browse Source 
* fix bug 20022

See merge request easycorp/zentaopms!2033
This commit is contained in:
王怡栋
2022-03-02 01:58:48 +00:00
parent a28796c991 f4970f502d
commit b7bcd483ab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/task/ext/config/lite.php
+1 -1
View File
@@ -5,6 +5,6 @@ $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'a
$config->task->datatable->fieldList['lane']['title'] = 'lane';
$config->task->datatable->fieldList['lane']['fixed'] = 'no';
$config->task->datatable->fieldList['lane']['width'] = '90';
$config->task->datatable->fieldList['lane']['width'] = 'auto';
$config->task->datatable->fieldList['lane']['required'] = 'no';
$config->task->datatable->fieldList['lane']['sort'] = 'no';
module/task/model.php
+2 -2
View File
@@ -2158,7 +2158,7 @@ class taskModel extends model
->leftJoin(TABLE_KANBANLANE)->alias('t2')->on('t1.lane = t2.id')
->where('t1.kanban')->eq($executionID)
->andWhere("($cardsWhere)")
->fetchAll('cards');
->fetchAll();
foreach($tasks as $task)
{
@@ -2167,7 +2167,7 @@ class taskModel extends model
{
foreach($lanes as $lane)
{
if(strpos($lane->cards, $task->id) !== false) $task->lane = $lane->name;
if(strpos($lane->cards, ",{$task->id},") !== false) $task->lane = $lane->name;
}
}
}