From 6cf044da20992a0acc64e83ad44a6e71a9ae6b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Wed, 26 Jan 2022 10:26:18 +0800 Subject: [PATCH] * Fix details. --- module/execution/control.php | 2 +- module/tutorial/model.php | 56 ++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index 0247ec3130..d91c728dcf 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -3621,7 +3621,7 @@ class execution extends control if($lastEditedTime > $enterTime or $groupBy != 'default') { - $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy);; + $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy); die(json_encode($kanbanGroup)); } else diff --git a/module/tutorial/model.php b/module/tutorial/model.php index ed681e8003..150a7d7666 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -269,34 +269,34 @@ class tutorialModel extends model public function getExecution() { $execution = new stdclass(); - $execution->id = 3; - $execution->project = 2; - $execution->type = 'sprint'; - $execution->name = 'Test execution'; - $execution->code = 'test'; - $execution->lifetime = ''; - $execution->begin = date('Y-m-d', strtotime('-7 days')); - $execution->end = date('Y-m-d', strtotime('+7 days')); - $execution->days = 10; - $execution->status = 'wait'; - $execution->pri = '1'; - $execution->desc = ''; - $execution->goal = ''; - $execution->acl = 'open'; - $execution->parent = 2; - $execution->path = ',2,3,'; - $execution->grade = 1; - $execution->PM = $this->app->user->account; - $execution->PO = $this->app->user->account; - $execution->QD = $this->app->user->account; - $execution->RD = $this->app->user->account; - $execution->deleted = '0'; - $execution->totalConsumed = 0; - $execution->totalLeft = 0; - $execution->totalHours = 0; - $execution->totalEstimate = 0; - $execution->displayCards = 0; - $execution->fluidBoard = 0; + $execution->id = 3; + $execution->project = 2; + $execution->type = 'sprint'; + $execution->name = 'Test execution'; + $execution->code = 'test'; + $execution->lifetime = ''; + $execution->begin = date('Y-m-d', strtotime('-7 days')); + $execution->end = date('Y-m-d', strtotime('+7 days')); + $execution->days = 10; + $execution->status = 'wait'; + $execution->pri = '1'; + $execution->desc = ''; + $execution->goal = ''; + $execution->acl = 'open'; + $execution->parent = 2; + $execution->path = ',2,3,'; + $execution->grade = 1; + $execution->PM = $this->app->user->account; + $execution->PO = $this->app->user->account; + $execution->QD = $this->app->user->account; + $execution->RD = $this->app->user->account; + $execution->deleted = '0'; + $execution->totalConsumed = 0; + $execution->totalLeft = 0; + $execution->totalHours = 0; + $execution->totalEstimate = 0; + $execution->displayCards = 0; + $execution->fluidBoard = 0; return $execution; }