diff --git a/module/testreport/control.php b/module/testreport/control.php index 21dd1d26a0..0733bc8589 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -351,14 +351,14 @@ class testreport extends control if($_POST) { $changes = $this->testreport->update($reportID); - if(dao::isError()) return print(js::error(dao::getError())); + if(dao::isError()) return $this->send(array('result' => 'success', 'message' => dao::getError())); $files = $this->loadModel('file')->saveUpload('testreport', $reportID); $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : ''; $actionID = $this->loadModel('action')->create('testreport', $reportID, 'Edited', $fileAction); if(!empty($changes)) $this->action->logHistory($actionID, $changes); - return print(js::locate(inlink('view', "reportID=$reportID"), 'parent')); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => inlink('view', "reportID=$reportID"))); } $report = $this->testreport->getById($reportID); diff --git a/module/testreport/ui/create.html.php b/module/testreport/ui/create.html.php index f15c5aa505..22643623d9 100644 --- a/module/testreport/ui/create.html.php +++ b/module/testreport/ui/create.html.php @@ -154,11 +154,7 @@ formPanel formGroup ( set::label($lang->testreport->report), - editor - ( - set::name('report'), - set::value() - ) + editor(set::name('report')) ) ), formRow diff --git a/module/testreport/ui/edit.html.php b/module/testreport/ui/edit.html.php index d957cbdfdf..7760d7cf9b 100644 --- a/module/testreport/ui/edit.html.php +++ b/module/testreport/ui/edit.html.php @@ -131,7 +131,7 @@ formPanel editor ( set::name('report'), - set::value($report->report) + html($report->report) ) ) ), diff --git a/module/testreport/ui/view.html.php b/module/testreport/ui/view.html.php index 14b940a189..9f4c81ae17 100644 --- a/module/testreport/ui/view.html.php +++ b/module/testreport/ui/view.html.php @@ -370,7 +370,7 @@ div div(html(sprintf($lang->testreport->bugSummary, $bugSummary['foundBugs'], count($legacyBugs), $bugSummary['activatedBugs'], $bugSummary['countBugByTask'], $bugSummary['bugConfirmedRate'] . '%', $bugSummary['bugCreateByCaseRate'] . '%'))) ) ), - item(set::name($lang->testreport->legendComment), empty($report->report) ? $lang->testreport->none : $report->report), + item(set::name($lang->testreport->legendComment), empty($report->report) ? $lang->testreport->none : html($report->report)), ) ), $report->files ? section diff --git a/module/testsuite/config/table.php b/module/testsuite/config/table.php index f4be938697..da963d232d 100644 --- a/module/testsuite/config/table.php +++ b/module/testsuite/config/table.php @@ -54,7 +54,6 @@ $config->testsuite->dtable->fieldList['addedDate']['sortType'] = true; $config->testsuite->dtable->fieldList['actions']['name'] = 'actions'; $config->testsuite->dtable->fieldList['actions']['title'] = $lang->actions; $config->testsuite->dtable->fieldList['actions']['type'] = 'actions'; -$config->testsuite->dtable->fieldList['actions']['width'] = '140'; $config->testsuite->dtable->fieldList['actions']['fixed'] = 'right'; $config->testsuite->dtable->fieldList['actions']['sortType'] = false; $config->testsuite->dtable->fieldList['actions']['list'] = $config->testsuite->actionList; diff --git a/module/testsuite/ui/browse.html.php b/module/testsuite/ui/browse.html.php index 717f648e44..c2478b932d 100644 --- a/module/testsuite/ui/browse.html.php +++ b/module/testsuite/ui/browse.html.php @@ -45,7 +45,7 @@ dtable ( set::cols($cols), set::data($data), - set::fixedLeftWidth('0.2'), + set::fixedLeftWidth('0.33'), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), );