diff --git a/framework/helper.class.php b/framework/helper.class.php index 4cd5e1cd5a..02022d66c3 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -717,8 +717,8 @@ function initItemActions(object &$item, string $actionMenu, array $actionList, o $module = $actionConfig['url']['module']; if(!$notLoadModel) { - $rowModule = $module == 'projectbuild' ? 'build' : $module; - $model = $app->control->loadModel($rowModule); + $rawModule = $module == 'projectbuild' ? 'build' : $module; + $model = $app->control->loadModel($rawModule); } } diff --git a/module/my/config/table.php b/module/my/config/table.php index 22fbb379a5..0090ac95b6 100644 --- a/module/my/config/table.php +++ b/module/my/config/table.php @@ -1132,4 +1132,3 @@ unset($config->my->team->dtable->fieldList['actions']); $config->my->project = new stdclass(); $config->my->project->dtable = $config->project->dtable; - diff --git a/module/project/ui/build.html.php b/module/project/ui/build.html.php index 2520b7a8bd..83a3cca85a 100644 --- a/module/project/ui/build.html.php +++ b/module/project/ui/build.html.php @@ -49,12 +49,12 @@ jsVar('integratedTip', $lang->build->integrated); jsVar('deletedTip', $lang->build->deleted); $fieldList = $config->build->dtable->fieldList; -if($project->model == 'kanban' && $this->app->rawModule == 'projectbuild') +if($project->model == 'kanban' && $app->rawModule == 'projectbuild') { unset($fieldList['actions']['list']['createTest']['data-app']); $fieldList['actions']['list']['viewBug']['url'] = $config->build->actionList['projectBugList']['url']; } -$builds = initTableData($builds, $fieldList, $app->control->build); +$builds = initTableData($builds, $fieldList, $this->build); dtable ( diff --git a/module/testcase/js/batchcreate.js b/module/testcase/js/batchcreate.js index d5c6f32f92..8e0e217daf 100644 --- a/module/testcase/js/batchcreate.js +++ b/module/testcase/js/batchcreate.js @@ -76,10 +76,10 @@ function canSceneDitto(num) var trList = $("#tableBody").find("tbody").find("tr"); - var rowModule = $(trList[rIndex]).find("td:eq(2)").find("select").val(); + var rawModule = $(trList[rIndex]).find("td:eq(2)").find("select").val(); var preModule = $(trList[rIndex-1]).find("td:eq(2)").find("select").val(); - return rowModule == "ditto" || rowModule == preModule; + return rawModule == "ditto" || rawModule == preModule; } function onModuleChanged(productID, moduleID, num)