diff --git a/module/execution/control.php b/module/execution/control.php index d91c728dcf..fef5eab357 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2024,7 +2024,6 @@ class execution extends control { if($this->execution->isClickable($execution, $action)) $executionActions[] = $action; } - $userList = array(); $users = $this->loadModel('user')->getPairs('noletter|nodeleted'); $avatarPairs = $this->user->getAvatarPairs(); diff --git a/module/execution/model.php b/module/execution/model.php index 5ca8a7feb6..d5e514b202 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -363,7 +363,7 @@ class executionModel extends model $this->dao->insert(TABLE_EXECUTION)->data($sprint) ->autoCheck($skipFields = 'begin,end') ->batchcheck($this->config->execution->create->requiredFields, 'notempty') - ->checkIF((!empty($sprint->name) and $this->config->systemMode == 'new'), 'name', 'unique', "`type` in ('sprint','stage') and `project` = $sprintProject") + ->checkIF((!empty($sprint->name) and $this->config->systemMode == 'new'), 'name', 'unique', "`type` in ('sprint','stage', 'kanban') and `project` = $sprintProject") ->checkIF(!empty($sprint->code), 'code', 'unique', "`type` in ('sprint','stage')") ->checkIF($sprint->begin != '', 'begin', 'date') ->checkIF($sprint->end != '', 'end', 'date') diff --git a/module/kanban/model.php b/module/kanban/model.php index 65de5fea37..b3f00af291 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2036,7 +2036,6 @@ class kanbanModel extends model $lane->type = $type; $lane->execution = $executionID; $this->dao->insert(TABLE_KANBANLANE)->data($lane)->exec(); - $laneID = $this->dao->lastInsertId(); $this->createExecutionColumns($laneID, $type, $executionID); }