diff --git a/module/execution/control.php b/module/execution/control.php index 4fe9be0e98..57654c28e2 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2786,7 +2786,7 @@ class execution extends control $this->loadModel('branch'); foreach($products as $product) { - $productModules = $this->tree->getOptionMenu($product->id, 'story', 0, array_keys($branches[$product->id])); + $productModules = $this->tree->getOptionMenu($product->id, 'story', 0, defined('TUTORIAL') ? array(0 => 0) : array_keys($branches[$product->id])); foreach($productModules as $branch => $branchModules) { foreach($branchModules as $moduleID => $moduleName) $modules[$moduleID] = ((count($products) >= 2 and $moduleID != 0) ? $product->name : '') . $moduleName; @@ -2825,7 +2825,7 @@ class execution extends control { $storyModule = $this->tree->getModulesName($story->module); $productName = count($products) > 1 ? $products[$story->product]->name : ''; - $modules[$story->module] = $productName . $storyModule[$story->module]; + $modules[$story->module] = $productName . zget($storyModule, $story->module, ''); } } diff --git a/module/tutorial/model.php b/module/tutorial/model.php index 150a7d7666..9b4f013265 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -277,6 +277,8 @@ class tutorialModel extends model $execution->lifetime = ''; $execution->begin = date('Y-m-d', strtotime('-7 days')); $execution->end = date('Y-m-d', strtotime('+7 days')); + $execution->realBegan = ''; + $execution->realEnd = ''; $execution->days = 10; $execution->status = 'wait'; $execution->pri = '1';