diff --git a/module/action/model.php b/module/action/model.php index aac9566abb..0c11821c8e 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -209,8 +209,8 @@ class actionModel extends model { $record = (array)$record; $record['product'] = isset($record['product']) ? ',' . $record['product'] . ',' : ',0,'; - if(!isset($record['project'])) $record['project'] = 0; - if(!isset($record['execution'])) $record['execution'] = 0; + if(empty($record['project'])) $record['project'] = 0; + if(empty($record['execution'])) $record['execution'] = 0; return $record; } diff --git a/module/build/control.php b/module/build/control.php index c08d9440f4..4dfe91451d 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -115,7 +115,7 @@ class build extends control { $this->loadModel('project')->setMenu($build->project); } - elseif($this->app->openApp == 'exectuion') + elseif($this->app->openApp == 'execution') { $this->execution->setMenu($build->execution); } diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index d4adc302e7..ab5fc55f21 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -29,7 +29,7 @@
- + " . $lang->testtask->create, '', "class='btn btn-primary'");?>
@@ -53,11 +53,6 @@ '> testtask->product);?> - -
- -
- idAB);?> testtask->name);?> @@ -81,11 +76,7 @@ - - id => sprintf('%03d', $task->id)));?> - id);?> - createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName);?> @@ -127,19 +118,6 @@ -