From 5cda35c9266dc07e8ef449c1cefb711b75efef5d Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Wed, 26 Apr 2017 09:55:46 +0800 Subject: [PATCH] * finish task #2983. --- module/testsuite/config.php | 12 ++++++++---- module/testsuite/model.php | 1 + module/testsuite/view/ajaxgetdropmenu.html.php | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/module/testsuite/config.php b/module/testsuite/config.php index abff3dc190..4d20c4b2ad 100644 --- a/module/testsuite/config.php +++ b/module/testsuite/config.php @@ -1,9 +1,13 @@ testsuite = new stdclass(); -$config->testsuite->create = new stdclass(); -$config->testsuite->edit = new stdclass(); -$config->testsuite->create->requiredFields = 'name'; -$config->testsuite->edit->requiredFields = 'name'; +$config->testsuite->create = new stdclass(); +$config->testsuite->edit = new stdclass(); +$config->testsuite->createlib = new stdclass(); +$config->testsuite->createcase = new stdclass(); +$config->testsuite->create->requiredFields = 'name'; +$config->testsuite->edit->requiredFields = 'name'; +$config->testsuite->createlib->requiredFields = 'name'; +$config->testsuite->createcase->requiredFields = 'title,type'; $config->testsuite->editor = new stdclass(); $config->testsuite->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); diff --git a/module/testsuite/model.php b/module/testsuite/model.php index 97d9a1768d..174bec7dfe 100644 --- a/module/testsuite/model.php +++ b/module/testsuite/model.php @@ -335,6 +335,7 @@ class testsuiteModel extends model $lib = $this->loadModel('file')->processEditor($lib, $this->config->testsuite->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_TESTSUITE)->data($lib) ->batchcheck($this->config->testsuite->createlib->requiredFields, 'notempty') + ->check('name', 'unique', "deleted = '0'") ->exec(); if(!dao::isError()) { diff --git a/module/testsuite/view/ajaxgetdropmenu.html.php b/module/testsuite/view/ajaxgetdropmenu.html.php index 2f34f07c52..a04a0dbeed 100644 --- a/module/testsuite/view/ajaxgetdropmenu.html.php +++ b/module/testsuite/view/ajaxgetdropmenu.html.php @@ -5,7 +5,7 @@ $libName) { - echo "
  • " . html::a(sprintf($link, $libID), " " . $libName). "
  • "; + echo "
  • " . html::a(sprintf($link, $libID), " " . $libName). "
  • "; } ?>