diff --git a/module/testcase/control.php b/module/testcase/control.php index 8755d20e29..ad44bc55dd 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -2565,19 +2565,15 @@ class testcase extends control } /** - * Create scene. + * Create a scene. * * @param int $productID - * @param int $branch + * @param string $branch * @param int $moduleID - * @param string $from - * @param string $param - * @param int $storyID - * @param string $extras * @access public * @return void */ - public function createScene($productID, $branch = '', $moduleID = 0, $from = '', $param = 0, $storyID = 0, $extras = '') + public function createScene($productID, $branch = '', $moduleID = 0) { if(!empty($_POST)) { @@ -2642,16 +2638,12 @@ class testcase extends control } $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->newScene; - $this->view->productID = $productID; $this->view->currentModuleID = $currentModuleID; $this->view->currentParentID = $currentParentID; - $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('testcase', 'browse', "productID=$productID") : ''; - $this->view->showFields = $this->config->testcase->custom->createFields; $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, ($branch === 'all' or !isset($branches[$branch])) ? 0 : $branch); $this->view->branch = $branch; $this->view->product = $product; $this->view->branches = $branches; - $this->view->sceneTitle = ''; $this->view->sceneOptionMenu = $this->testcase->getSceneMenu($productID, $moduleID, $viewType = 'case', $startSceneID = 0, ($branch === 'all' or !isset($branches[$branch])) ? 0 : $branch); $this->display(); diff --git a/module/testcase/view/createscene.html.php b/module/testcase/view/createscene.html.php index bbe645193a..cfa3ba1108 100644 --- a/module/testcase/view/createscene.html.php +++ b/module/testcase/view/createscene.html.php @@ -11,7 +11,6 @@ */ ?> getModuleRoot() . 'common/view/header.html.php';?> -getModuleRoot() . 'common/view/kindeditor.html.php';?> testcase->deleteStep);?> testcase->insertBefore);?> @@ -26,12 +25,6 @@

testcase->newScene;?>

- testcase->createscene->requiredFields) as $field) - { - if($field and strpos($showFields, $field) === false) $showFields .= ',' . $field; - } - ?>
@@ -39,7 +32,7 @@ @@ -51,8 +44,8 @@ if(count($moduleOptionMenu) == 1) { echo ""; - echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case¤tModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'"); - echo html::a("javascript:void(0)", $lang->refresh, '', "class='refresh' onclick='loadProductModulesNew($productID)'"); + echo html::a($this->createLink('tree', 'browse', "rootID={$product->id}&view=case¤tModuleID=0&branch={$branch}", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'"); + echo html::a("javascript:void(0)", $lang->refresh, '', "class='refresh' onclick='loadProductModulesNew({$product->id})'"); echo ''; } ?> @@ -78,7 +71,7 @@
testcase->product;?>
- + id, "onchange='loadAllNew(this.value);' class='form-control chosen'");?> type) and $product->type != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranchNew();' class='form-control' style='width:120px'");?>
- goback, '', 'class="btn btn-wide"') : html::backButton();?> +