From de3eac4fc5845bafc232a34251e6409f73b9d892 Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 31 Jul 2024 07:26:54 +0000 Subject: [PATCH] * [misc] move params. --- module/pivot/control.php | 2 +- module/pivot/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/pivot/control.php b/module/pivot/control.php index 946439a36d..536d3d55df 100644 --- a/module/pivot/control.php +++ b/module/pivot/control.php @@ -96,7 +96,7 @@ class pivot extends control } $cols = $this->pivot->getDrillCols($drill->object); - $datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotID, $drill, $mergeConditions, $filterValues, $status); + $datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotID, $drill, $status, $mergeConditions, $filterValues, $status); if(strpos(',story,task,bug,', ",{$drill->object},") !== false) $datas = $this->pivot->processKanbanDatas($drill->object, $datas); diff --git a/module/pivot/model.php b/module/pivot/model.php index 6e50bd6a25..e35ef95330 100644 --- a/module/pivot/model.php +++ b/module/pivot/model.php @@ -2497,7 +2497,7 @@ class pivotModel extends model * @access public * @return array */ - public function getDrillDatas(int $pivotID, object $drill, array $conditions, array $filterValues = array(), string $status): array + public function getDrillDatas(int $pivotID, object $drill, string $status, array $conditions, array $filterValues = array()): array { $pivot = $this->getById($pivotID, false, $status);