diff --git a/module/testsuite/config/form.php b/module/testsuite/config/form.php index c224dbb70c..1480285fd9 100644 --- a/module/testsuite/config/form.php +++ b/module/testsuite/config/form.php @@ -23,4 +23,4 @@ $config->testsuite->form->linkCase['cases'] = array('required' => true, 'type $config->testsuite->form->linkCase['versions'] = array('required' => true, 'type' => 'array', 'default' => []); $config->testsuite->form->batchUnlinkCases = array(); -$config->testsuite->form->batchUnlinkCases['caseIDList'] = array('required' => true, 'type' => 'array', 'default' => []); +$config->testsuite->form->batchUnlinkCases['caseIdList'] = array('required' => true, 'type' => 'array', 'default' => []); diff --git a/module/testsuite/control.php b/module/testsuite/control.php index 334267a873..73ae97af6e 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -236,7 +236,7 @@ class testsuite extends control } $message = $this->executeHooks($suiteID) ? : $this->lang->testsuite->successSaved; - return $this->send(array('result' => 'fail', 'message' => $message, 'locate' => inlink('view', "suiteID={$suiteID}"))); + return $this->send(array('result' => 'success', 'message' => $message, 'locate' => inlink('view', "suiteID={$suiteID}"))); } /* 设置1.5级导航。 */ @@ -351,7 +351,7 @@ class testsuite extends control */ public function unlinkCase(int $suiteID, int $caseID) { - $this->testsuite->deleteCaseBysuiteID(array($caseID), $suiteID); + $this->testsuite->deleteCaseBySuiteID(array($caseID), $suiteID); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); return $this->send(array('result' => 'success', 'load' => true)); @@ -368,7 +368,8 @@ class testsuite extends control public function batchUnlinkCases(int $suiteID) { $formData = form::data($this->config->testsuite->form->batchUnlinkCases)->get(); - $this->testsuite->deleteCaseBysuiteID($formData->caseIDList, $suiteID); + $this->testsuite->deleteCaseBySuiteID($formData->caseIdList, $suiteID); + if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); return $this->send(array('result' => 'success', 'load' => true)); diff --git a/module/testsuite/js/view.ui.js b/module/testsuite/js/view.ui.js index a580a6381a..fb3c4c1f3b 100644 --- a/module/testsuite/js/view.ui.js +++ b/module/testsuite/js/view.ui.js @@ -6,7 +6,7 @@ $(document).off('click', '.batch-btn > a, .batch-btn').on('click', '.batch-btn > const url = $(this).data('url'); const form = new FormData(); - checkedList.forEach((id) => form.append('caseIDList[]', id)); + checkedList.forEach((id) => form.append('caseIdList[]', id)); if($(this).hasClass('ajax-btn')) { diff --git a/module/testsuite/ui/view.html.php b/module/testsuite/ui/view.html.php index 4e30f553d5..892ecc3519 100644 --- a/module/testsuite/ui/view.html.php +++ b/module/testsuite/ui/view.html.php @@ -19,7 +19,8 @@ detailHeader set::entityID($suite->id), set::level(1), set::text($suite->name) - ) + ), + $suite->deleted ? span(setClass('label danger'), $lang->testsuite->deleted) : null, ), to::suffix (