From a0c035343e672ad2d03eff10a6e97ef4cf9827eb Mon Sep 17 00:00:00 2001 From: zhaoke Date: Wed, 26 Apr 2023 15:30:50 +0800 Subject: [PATCH] * Fix bug #34826,34821,34815. --- config/zentaopms.php | 6 ++--- module/testcase/config.php | 35 +++++++++++++++++++++++----- module/testcase/control.php | 5 ++-- module/testcase/view/browse.html.php | 6 ++--- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index c7d8450900..4422aea4af 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -236,9 +236,9 @@ $config->openMethods[] = 'caselib.index'; $config->openMethods[] = 'company.index'; $config->openMethods[] = 'user.cropAvatar'; $config->openMethods[] = 'custom.index'; -$config->openMethods[] = 'testcase.getXmindImport'; -$config->openMethods[] = 'testcase.showXMindImport'; -$config->openMethods[] = 'testcase.saveXmindImport'; +$config->openMethods[] = 'testcase.getxmindimport'; +$config->openMethods[] = 'testcase.showxmindimport'; +$config->openMethods[] = 'testcase.savexmindimport'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/testcase/config.php b/module/testcase/config.php index e0c751dd96..6b2c937d77 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -87,41 +87,49 @@ $config->testcase->datatable->fieldList['id']['title'] = 'idAB'; $config->testcase->datatable->fieldList['id']['fixed'] = 'left'; $config->testcase->datatable->fieldList['id']['width'] = '70'; $config->testcase->datatable->fieldList['id']['required'] = 'yes'; +$config->testcase->datatable->fieldList['id']['sort'] = 'no'; $config->testcase->datatable->fieldList['product']['title'] = 'priAB'; $config->testcase->datatable->fieldList['product']['control'] = 'hidden'; $config->testcase->datatable->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs', 'params' => '&0&&all'); +$config->testcase->datatable->fieldList['product']['sort'] = 'no'; $config->testcase->datatable->fieldList['module']['title'] = 'module'; $config->testcase->datatable->fieldList['module']['control'] = 'select'; $config->testcase->datatable->fieldList['module']['dataSource'] = array('module' => 'testcase', 'method' => 'getDatatableModules', 'params' => '$productID'); +$config->testcase->datatable->fieldList['module']['sort'] = 'no'; $config->testcase->datatable->fieldList['title']['title'] = 'title'; $config->testcase->datatable->fieldList['title']['fixed'] = 'left'; $config->testcase->datatable->fieldList['title']['width'] = 'auto'; $config->testcase->datatable->fieldList['title']['required'] = 'yes'; +$config->testcase->datatable->fieldList['title']['sort'] = 'no'; $config->testcase->datatable->fieldList['branch']['title'] = 'branch'; $config->testcase->datatable->fieldList['branch']['fixed'] = 'left'; $config->testcase->datatable->fieldList['branch']['width'] = '100'; $config->testcase->datatable->fieldList['branch']['required'] = 'no'; $config->testcase->datatable->fieldList['branch']['dataSource'] = array('module' => 'branch', 'method' => 'getPairs', 'params' => '$productID'); +$config->testcase->datatable->fieldList['branch']['sort'] = 'no'; $config->testcase->datatable->fieldList['pri']['title'] = 'priAB'; $config->testcase->datatable->fieldList['pri']['fixed'] = 'left'; $config->testcase->datatable->fieldList['pri']['width'] = '40'; $config->testcase->datatable->fieldList['pri']['required'] = 'no'; $config->testcase->datatable->fieldList['pri']['name'] = $lang->testcase->pri; +$config->testcase->datatable->fieldList['pri']['sort'] = 'no'; $config->testcase->datatable->fieldList['type']['title'] = 'type'; $config->testcase->datatable->fieldList['type']['fixed'] = 'no'; $config->testcase->datatable->fieldList['type']['width'] = '80'; $config->testcase->datatable->fieldList['type']['required'] = 'no'; +$config->testcase->datatable->fieldList['type']['sort'] = 'no'; $config->testcase->datatable->fieldList['assignedTo']['title'] = 'assignedTo'; $config->testcase->datatable->fieldList['assignedTo']['fixed'] = 'no'; $config->testcase->datatable->fieldList['assignedTo']['width'] = '90'; $config->testcase->datatable->fieldList['assignedTo']['required'] = 'no'; +$config->testcase->datatable->fieldList['assignedTo']['sort'] = 'no'; $config->testcase->datatable->fieldList['status']['title'] = 'statusAB'; if($app->rawMethod == 'cases') @@ -134,32 +142,38 @@ else } $config->testcase->datatable->fieldList['status']['fixed'] = 'no'; $config->testcase->datatable->fieldList['status']['required'] = 'no'; +$config->testcase->datatable->fieldList['status']['sort'] = 'no'; $config->testcase->datatable->fieldList['openedBy']['title'] = 'openedByAB'; $config->testcase->datatable->fieldList['openedBy']['fixed'] = 'no'; $config->testcase->datatable->fieldList['openedBy']['width'] = '80'; $config->testcase->datatable->fieldList['openedBy']['required'] = 'no'; +$config->testcase->datatable->fieldList['openedBy']['sort'] = 'no'; $config->testcase->datatable->fieldList['openedDate']['title'] = 'openedDate'; $config->testcase->datatable->fieldList['openedDate']['fixed'] = 'no'; $config->testcase->datatable->fieldList['openedDate']['width'] = '90'; $config->testcase->datatable->fieldList['openedDate']['required'] = 'no'; +$config->testcase->datatable->fieldList['openedDate']['sort'] = 'no'; $config->testcase->datatable->fieldList['stage']['title'] = 'stage'; $config->testcase->datatable->fieldList['stage']['fixed'] = 'no'; $config->testcase->datatable->fieldList['stage']['width'] = '110'; $config->testcase->datatable->fieldList['stage']['required'] = 'no'; $config->testcase->datatable->fieldList['stage']['control'] = 'multiple'; +$config->testcase->datatable->fieldList['stage']['sort'] = 'no'; $config->testcase->datatable->fieldList['precondition']['title'] = 'precondition'; $config->testcase->datatable->fieldList['precondition']['fixed'] = 'no'; $config->testcase->datatable->fieldList['precondition']['width'] = '120'; $config->testcase->datatable->fieldList['precondition']['required'] = 'no'; +$config->testcase->datatable->fieldList['precondition']['sort'] = 'no'; $config->testcase->datatable->fieldList['keywords']['title'] = 'keywords'; $config->testcase->datatable->fieldList['keywords']['fixed'] = 'no'; $config->testcase->datatable->fieldList['keywords']['width'] = '100'; $config->testcase->datatable->fieldList['keywords']['required'] = 'no'; +$config->testcase->datatable->fieldList['keywords']['sort'] = 'no'; $config->testcase->datatable->fieldList['story']['title'] = 'story'; $config->testcase->datatable->fieldList['story']['fixed'] = 'no'; @@ -167,46 +181,55 @@ $config->testcase->datatable->fieldList['story']['width'] = '90'; $config->testcase->datatable->fieldList['story']['required'] = 'no'; $config->testcase->datatable->fieldList['story']['control'] = 'select'; $config->testcase->datatable->fieldList['story']['dataSource'] = array('module' => 'story', 'method' => 'getProductStoryPairs', 'params' => '$productID&$branch'); +$config->testcase->datatable->fieldList['story']['sort'] = 'no'; $config->testcase->datatable->fieldList['reviewedBy']['title'] = 'reviewedBy'; $config->testcase->datatable->fieldList['reviewedBy']['fixed'] = 'no'; $config->testcase->datatable->fieldList['reviewedBy']['width'] = '80'; $config->testcase->datatable->fieldList['reviewedBy']['required'] = 'no'; +$config->testcase->datatable->fieldList['reviewedBy']['sort'] = 'no'; $config->testcase->datatable->fieldList['reviewedDate']['title'] = 'reviewedDate'; $config->testcase->datatable->fieldList['reviewedDate']['fixed'] = 'no'; $config->testcase->datatable->fieldList['reviewedDate']['width'] = '90'; $config->testcase->datatable->fieldList['reviewedDate']['required'] = 'no'; +$config->testcase->datatable->fieldList['reviewedDate']['sort'] = 'no'; $config->testcase->datatable->fieldList['lastRunner']['title'] = 'lastRunner'; $config->testcase->datatable->fieldList['lastRunner']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastRunner']['width'] = '70'; $config->testcase->datatable->fieldList['lastRunner']['required'] = 'no'; +$config->testcase->datatable->fieldList['lastRunner']['sort'] = 'no'; $config->testcase->datatable->fieldList['lastRunDate']['title'] = 'lastRunDate'; $config->testcase->datatable->fieldList['lastRunDate']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastRunDate']['width'] = '90'; $config->testcase->datatable->fieldList['lastRunDate']['required'] = 'no'; +$config->testcase->datatable->fieldList['lastRunDate']['sort'] = 'no'; $config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult'; $config->testcase->datatable->fieldList['lastRunResult']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastRunResult']['width'] = '70'; $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no'; +$config->testcase->datatable->fieldList['lastRunResult']['sort'] = 'no'; $config->testcase->datatable->fieldList['lastEditedBy']['title'] = 'lastEditedBy'; $config->testcase->datatable->fieldList['lastEditedBy']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastEditedBy']['width'] = '92'; $config->testcase->datatable->fieldList['lastEditedBy']['required'] = 'no'; +$config->testcase->datatable->fieldList['lastEditedBy']['sort'] = 'no'; $config->testcase->datatable->fieldList['lastEditedDate']['title'] = 'lastEditedDate'; $config->testcase->datatable->fieldList['lastEditedDate']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastEditedDate']['width'] = '90'; $config->testcase->datatable->fieldList['lastEditedDate']['required'] = 'no'; +$config->testcase->datatable->fieldList['lastEditedDate']['sort'] = 'no'; $config->testcase->datatable->fieldList['version']['title'] = 'version'; $config->testcase->datatable->fieldList['version']['fixed'] = 'no'; $config->testcase->datatable->fieldList['version']['width'] = '60'; $config->testcase->datatable->fieldList['version']['required'] = 'no'; +$config->testcase->datatable->fieldList['version']['sort'] = 'no'; $config->testcase->datatable->fieldList['bugs']['title'] = 'B'; $config->testcase->datatable->fieldList['bugs']['fixed'] = 'no'; @@ -215,12 +238,12 @@ $config->testcase->datatable->fieldList['bugs']['required'] = 'no'; $config->testcase->datatable->fieldList['bugs']['sort'] = 'no'; $config->testcase->datatable->fieldList['bugs']['name'] = $lang->testcase->bugs; -$config->testcase->datatable->fieldList['results']['title'] = 'R'; -$config->testcase->datatable->fieldList['results']['fixed'] = 'no'; -$config->testcase->datatable->fieldList['results']['width'] = '32'; -$config->testcase->datatable->fieldList['results']['required'] = 'no'; -$config->testcase->datatable->fieldList['results']['sort'] = 'no'; -$config->testcase->datatable->fieldList['results']['name'] = $lang->testcase->results; +$config->testcase->datatable->fieldList['results']['title'] = 'R'; +$config->testcase->datatable->fieldList['results']['fixed'] = 'no'; +$config->testcase->datatable->fieldList['results']['width'] = '32'; +$config->testcase->datatable->fieldList['results']['required'] = 'no'; +$config->testcase->datatable->fieldList['results']['sort'] = 'no'; +$config->testcase->datatable->fieldList['results']['name'] = $lang->testcase->results; $config->testcase->datatable->fieldList['results']['dataSource'] = array('lang' => 'resultList'); $config->testcase->datatable->fieldList['stepNumber']['title'] = 'S'; diff --git a/module/testcase/control.php b/module/testcase/control.php index d5a387a6e4..8032bebdde 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -3081,7 +3081,6 @@ class testcase extends control $idList = explode(',', trim($this->post->scenes, ',')); $orderBy = $this->post->orderBy; if(strpos($orderBy, 'sort') === false) return false; - /* Get list of original scenes and cases, and sort with orderBy param. */ $scenesMap = $this->dao->select('id,sort,isCase')->from(VIEW_SCENECASE)->where('id')->in($idList)->orderBy($orderBy)->fetchAll('id'); @@ -3236,7 +3235,7 @@ class testcase extends control * @access public * @return void */ - public function importXMind($productID, $branch) + public function importXmind($productID, $branch) { if($_FILES) { @@ -3426,7 +3425,7 @@ class testcase extends control * @access public * @return void */ - public function showXMindImport($productID,$branch) + public function showXmindImport($productID,$branch) { if(!commonModel::hasPriv("testcase", "importXmind")) $this->loadModel('common')->deny('testcase', 'importXmind'); $product = $this->product->getById($productID); diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 760712b5aa..511f8c8c15 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -387,7 +387,7 @@ $('#module' + moduleID).closest('li').addClass('active'); $('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after(" recTotal;?>"); function runAutocase() { - var caseIDList = array(); + var caseIDList = []; $.each($('input[name^=caseIDList]:checked'),function(){ caseIDList.push($(this).val()); }); @@ -452,8 +452,8 @@ function toOrder(sourceId,targetId) { if(!checkProduct(sourceId, targetId)) return; - var origOrders = array(); - var newOrders = array(); + var origOrders = []; + var newOrders = []; var productID = 0; $('#caseTableList > tr').each(function(i, elem){