diff --git a/module/testreport/ui/create.html.php b/module/testreport/ui/create.html.php
index 6ea6667dfd..ceee24e54b 100644
--- a/module/testreport/ui/create.html.php
+++ b/module/testreport/ui/create.html.php
@@ -19,7 +19,7 @@ formPanel
(
on::change('#selectTask', 'changeTesttask'),
set::title($lang->testreport->create),
- formRow
+ !empty($taskPairs) ? formRow
(
formGroup
(
@@ -31,7 +31,7 @@ formPanel
set::items($taskPairs),
set::value($objectID)
)
- ),
+ ) : null,
formRow
(
formGroup
diff --git a/module/testreport/zen.php b/module/testreport/zen.php
index 813c0b1f45..96ecdb6bb5 100644
--- a/module/testreport/zen.php
+++ b/module/testreport/zen.php
@@ -202,9 +202,9 @@ class testreportZen extends testreport
if($task->build != 'trunk') $buildIdList[$task->build] = $task->build;
}
- $task = $objectID ? $this->testtask->getByID($objectID) : key($tasks);
- $begin = !empty($begin) ? date("Y-m-d", strtotime($begin)) : $task->begin;
- $end = !empty($end) ? date("Y-m-d", strtotime($end)) : $task->end;
+ $task = $objectID ? $this->testtask->getByID($extra) : key($tasks);
+ $begin = !empty($begin) ? date("Y-m-d", strtotime($begin)) : (string)$task->begin;
+ $end = !empty($end) ? date("Y-m-d", strtotime($end)) : (string)$task->end;
$builds = $this->build->getByList($buildIdList);
$bugs = $this->testreport->getBugs4Test($builds, $productIdList, $begin, $end, 'execution');
$execution = $this->execution->getById($executionID);