* Rename the testcase::batchCaseTypeChange method to testcase:batchChangeType method.

This commit is contained in:
liugang
2023-08-25 15:36:16 +08:00
parent 7e355372ef
commit b332efe177
19 changed files with 45 additions and 39 deletions
+5
View File
@@ -439,3 +439,8 @@ ALTER TABLE `zt_project` ADD `firstEnd` date DEFAULT NULL AFTER `end`;
ALTER TABLE `zt_product` ADD `closedDate` date DEFAULT NULL AFTER `createdVersion`;
ALTER TABLE `zt_productplan` ADD `finishedDate` datetime DEFAULT NULL AFTER `end`;
ALTER TABLE `zt_productplan` ADD `closedDate` datetime DEFAULT NULL AFTER `finishedDate`;
UPDATE `zt_grouppriv` SET `method` = 'batchChangeType' WHERE `method` = 'batchCaseTypeChange';
UPDATE `zt_priv` SET `method` = 'batchChangeType' WHERE `method` = 'batchCaseTypeChange';
UPDATE `zt_privlang` SET `key` = 'testcase-batchChangeType' WHERE `key` = 'testcase-batchCaseTypeChange';
UPDATE `zt_privrelation` SET `priv` = 'testcase-batchChangeType' WHERE `priv` = 'testcase-batchCaseTypeChange';
+6 -6
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -256,7 +256,7 @@ $lang->changelog['9.0'][] = 'mail-resend';
$lang->changelog['9.1'][] = 'testcase-review';
$lang->changelog['9.1'][] = 'testcase-batchReview';
$lang->changelog['9.1'][] = 'testcase-importFromLib';
$lang->changelog['9.1'][] = 'testcase-batchCaseTypeChange';
$lang->changelog['9.1'][] = 'testcase-batchChangeType';
$lang->changelog['9.1'][] = 'testcase-batchConfirmStoryChange';
$lang->changelog['9.1'][] = 'testreport-browse';
$lang->changelog['9.1'][] = 'testreport-create';
+2 -2
View File
@@ -1056,7 +1056,7 @@ $lang->resource->testcase->bugs = 'bugs';
$lang->resource->testcase->review = 'review';
$lang->resource->testcase->batchReview = 'batchReview';
$lang->resource->testcase->importFromLib = 'importFromLib';
$lang->resource->testcase->batchCaseTypeChange = 'batchCaseTypeChange';
$lang->resource->testcase->batchChangeType = 'batchChangeType';
$lang->resource->testcase->confirmLibcaseChange = 'confirmLibcaseChange';
$lang->resource->testcase->ignoreLibcaseChange = 'ignoreLibcaseChange';
$lang->resource->testcase->batchConfirmStoryChange = 'batchConfirmStoryChange';
@@ -1097,7 +1097,7 @@ $lang->testcase->methodOrder[95] = 'review';
$lang->testcase->methodOrder[100] = 'batchReview';
$lang->testcase->methodOrder[110] = 'batchConfirmStoryChange';
$lang->testcase->methodOrder[115] = 'importFromLib';
$lang->testcase->methodOrder[120] = 'batchCaseTypeChange';
$lang->testcase->methodOrder[120] = 'batchChangeType';
$lang->testcase->methodOrder[125] = 'confirmLibcaseChange';
$lang->testcase->methodOrder[130] = 'ignoreLibcaseChange';
$lang->testcase->methodOrder[135] = 'batchConfirmStoryChange';
+2 -2
View File
@@ -106,7 +106,7 @@ $config->project->noSprintPriv['project'] = array('edit', 'group', 'createGro
$config->project->noSprintPriv['execution'] = array('task', 'grouptask', 'importplanstories', 'importBug', 'story', 'burn', 'computeBurn', 'fixFirst', 'burnData', 'linkStory', 'unlinkStory', 'batchUnlinkStory', 'updateOrder', 'taskKanban', 'printKanban', 'tree', 'treeTask', 'treeStory', 'storyKanban', 'storySort', 'storyEstimate', 'setKanban', 'storyView', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt', 'ganttsetting', 'ganttEdit');
$config->project->noSprintPriv['story'] = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplate', 'importToLib', 'batchImportToLib', 'relation', 'browse');
$config->project->noSprintPriv['bug'] = array('create', 'confirm', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
$config->project->noSprintPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
$config->project->noSprintPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchChangeType', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
$config->project->noSprintPriv['testtask'] = array('create', 'cases', 'groupCase', 'edit', 'delete', 'batchAssign', 'linkcase', 'unlinkcase', 'runcase', 'results', 'batchUnlinkCases', 'report', 'browseUnits', 'unitCases', 'importUnitResult', 'batchRun', 'runDeployCase', 'deployCaseResults');
$config->project->includedPriv['doc'] = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'view', 'delete', 'deleteFile', 'collect', 'projectSpace', 'showFiles', 'addCatalog', 'editCatalog', 'deleteCatalog', 'displaySetting', 'diff', 'importToPracticeLib', 'importToComponentLib');
$config->project->noSprintPriv['repo'] = array('create', 'showSyncCommit', 'browse', 'view', 'diff', 'log', 'revision', 'blame', 'download', 'apiGetRepoByUrl', 'review', 'addBug', 'editBug', 'deleteBug', 'addComment', 'editComment', 'deleteComment');
@@ -118,7 +118,7 @@ $config->project->includedPriv['project'][] = 'execution';
$config->project->includedPriv['task'] = array('create');
$config->project->includedPriv['story'] = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplate', 'importToLib', 'batchImportToLib', 'relation', 'browse');
$config->project->includedPriv['bug'] = array('create', 'confirm', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
$config->project->includedPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
$config->project->includedPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchChangeType', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
$config->project->includedPriv['testtask'] = array('create', 'cases', 'groupCase', 'edit', 'delete', 'batchAssign', 'linkcase', 'unlinkcase', 'runcase', 'results', 'batchUnlinkCases', 'report', 'browseUnits', 'unitCases', 'importUnitResult', 'batchRun', 'runDeployCase', 'deployCaseResults');
$config->project->includedPriv['doc'] = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'view', 'delete', 'deleteFile', 'collect', 'projectSpace', 'showFiles', 'addCatalog', 'editCatalog', 'deleteCatalog', 'displaySetting', 'diff', 'importToPracticeLib', 'importToComponentLib');
$config->project->includedPriv['repo'] = array('create', 'showSyncCommit', 'browse', 'view', 'diff', 'log', 'revision', 'blame', 'download', 'apiGetRepoByUrl', 'review', 'addBug', 'deleteBug', 'addComment', 'editComment', 'deleteComment');
+1 -1
View File
@@ -916,7 +916,7 @@ class testcase extends control
* @access public
* @return void
*/
public function batchCaseTypeChange(string $type)
public function batchChangeType(string $type)
{
$caseIdList = zget($_POST, 'caseIdList', array());
if($caseIdList)
+1 -1
View File
@@ -130,7 +130,7 @@ $lang->testcase->batchChangeBranch = "Mehrere Branches ändern";
$lang->testcase->groupByStories = 'Group by Story';
$lang->testcase->batchDelete = "Mehrere löschen ";
$lang->testcase->batchConfirmStoryChange = "Mehrere bestätigen";
$lang->testcase->batchCaseTypeChange = "Mehrere Typen änderen";
$lang->testcase->batchChangeType = "Mehrere Typen änderen";
$lang->testcase->browse = "Fälle";
$lang->testcase->listView = "View by List";
$lang->testcase->groupCase = "Nach Gruppe";
+1 -1
View File
@@ -134,7 +134,7 @@ $lang->testcase->batchChangeBranch = "Batch Change Branches";
$lang->testcase->groupByStories = 'Group by Story';
$lang->testcase->batchDelete = "Batch Delete ";
$lang->testcase->batchConfirmStoryChange = "Batch Confirm";
$lang->testcase->batchCaseTypeChange = "Batch Change Types";
$lang->testcase->batchChangeType = "Batch Change Types";
$lang->testcase->browse = "Case List";
$lang->testcase->listView = "View by List";
$lang->testcase->groupCase = "View By Group";
+1 -1
View File
@@ -130,7 +130,7 @@ $lang->testcase->batchChangeBranch = "Changer Branches par Lot";
$lang->testcase->groupByStories = 'Grouper par Story';
$lang->testcase->batchDelete = "Supprimer par Lot ";
$lang->testcase->batchConfirmStoryChange = "Confirmer par Lot";
$lang->testcase->batchCaseTypeChange = "Changer Types par Lot";
$lang->testcase->batchChangeType = "Changer Types par Lot";
$lang->testcase->browse = "Liste CasTests";
$lang->testcase->listView = "View by List";
$lang->testcase->groupCase = "Vue par Groupe";
+1 -1
View File
@@ -128,7 +128,7 @@ $lang->testcase->batchChangeBranch = "Thay đổi chi nhánh hàng loạt"
$lang->testcase->groupByStories = 'câu chuyện';
$lang->testcase->batchDelete = "Xóa hàng loạt ";
$lang->testcase->batchConfirmStoryChange = "Xác nhận hàng loạt";
$lang->testcase->batchCaseTypeChange = "Thay đổi Loại hàng loạt";
$lang->testcase->batchChangeType = "Thay đổi Loại hàng loạt";
$lang->testcase->browse = "Danh sách tình huống";
$lang->testcase->listView = "View by List";
$lang->testcase->groupCase = "Xem theo Nhóm";
+1 -1
View File
@@ -134,7 +134,7 @@ $lang->testcase->batchChangeBranch = "批量修改分支";
$lang->testcase->groupByStories = "{$lang->common->story}分组";
$lang->testcase->batchDelete = "批量删除 ";
$lang->testcase->batchConfirmStoryChange = "批量确认变更";
$lang->testcase->batchCaseTypeChange = "批量修改类型";
$lang->testcase->batchChangeType = "批量修改类型";
$lang->testcase->browse = "用例列表";
$lang->testcase->listView = "列表视图";
$lang->testcase->groupCase = "分组浏览用例";
+1 -1
View File
@@ -128,7 +128,7 @@ $lang->testcase->batchChangeBranch = "批量修改分支";
$lang->testcase->groupByStories = "{$lang->SRCommon}分組";
$lang->testcase->batchDelete = "批量刪除 ";
$lang->testcase->batchConfirmStoryChange = "批量確認變更";
$lang->testcase->batchCaseTypeChange = "批量修改類型";
$lang->testcase->batchChangeType = "批量修改類型";
$lang->testcase->browse = "用例列表";
$lang->testcase->listView = "列表查看";
$lang->testcase->groupCase = "分組瀏覽用例";
+2 -2
View File
@@ -2052,11 +2052,11 @@ class testcaseModel extends model
$canBatchRun = common::hasPriv('testtask', 'batchRun');
$canBatchEdit = common::hasPriv('testcase', 'batchEdit');
$canBatchDelete = common::hasPriv('testcase', 'batchDelete');
$canBatchCaseTypeChange = common::hasPriv('testcase', 'batchCaseTypeChange');
$canBatchChangeType = common::hasPriv('testcase', 'batchChangeType');
$canBatchConfirmStoryChange = common::hasPriv('testcase', 'batchConfirmStoryChange');
$canBatchChangeModule = common::hasPriv('testcase', 'batchChangeModule');
$canBatchAction = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchCaseTypeChange or $canBatchConfirmStoryChange or $canBatchChangeModule);
$canBatchAction = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchChangeType or $canBatchConfirmStoryChange or $canBatchChangeModule);
$canView = common::hasPriv('testcase', 'view');
$caseLink = helper::createLink('testcase', 'view', "caseID=$case->id&version=$case->version");
+6 -6
View File
@@ -21,13 +21,13 @@ $canBatchRun = hasPriv('testtask', 'batchRun') && !$isOnlyScene;
$canBatchEdit = hasPriv('testcase', 'batchEdit') && !$isOnlyScene;
$canBatchReview = hasPriv('testcase', 'batchReview') && !$isOnlyScene && ($config->testcase->needReview || !empty($config->testcase->forceReview));
$canBatchDelete = hasPriv('testcase', 'batchDelete') && !$isOnlyScene;
$canBatchCaseTypeChange = hasPriv('testcase', 'batchCaseTypeChange') && !$isOnlyScene;
$canBatchChangeType = hasPriv('testcase', 'batchChangeType') && !$isOnlyScene;
$canBatchConfirmStoryChange = hasPriv('testcase', 'batchConfirmStoryChange') && !$isOnlyScene;
$canBatchChangeBranch = hasPriv('testcase', 'batchChangeBranch') && !$isOnlyScene && $this->session->currentProductType && $this->session->currentProductType != 'normal';
$canBatchChangeModule = hasPriv('testcase', 'batchChangeModule') && !empty($productID) && ($product->type == 'normal' || $branch !== 'all');
$canBatchChangeScene = hasPriv('testcase', 'batchChangeScene') && !$isOnlyScene;
$canImportToLib = hasPriv('testcase', 'importToLib') && !$isOnlyScene;
$canGroupBatch = ($canBatchRun || $canBatchEdit || $canBatchReview || $canBatchDelete || $canBatchCaseTypeChange || $canBatchConfirmStoryChange);
$canGroupBatch = ($canBatchRun || $canBatchEdit || $canBatchReview || $canBatchDelete || $canBatchChangeType || $canBatchConfirmStoryChange);
$canBatchAction = ($canGroupBatch || $canBatchChangeBranch || $canBatchChangeModule || $canBatchChangeScene || $canImportToLib);
$caseProductIds = array();
@@ -35,7 +35,7 @@ foreach($cases as $case) $caseProductIds[$case->product] = $case->product;
$caseProductID = count($caseProductIds) > 1 ? 0 : $productID;
$navActions = array();
if($canBatchReview || $canBatchDelete || $canBatchCaseTypeChange || $canBatchConfirmStoryChange)
if($canBatchReview || $canBatchDelete || $canBatchChangeType || $canBatchConfirmStoryChange)
{
if($canBatchReview)
{
@@ -48,12 +48,12 @@ if($canBatchReview || $canBatchDelete || $canBatchCaseTypeChange || $canBatchCon
$navActions[] = array('text' => $lang->testcase->review, 'class' => 'not-hide-menu', 'items' => $reviewItems);
}
if($canBatchDelete) $navActions[] = array('text' => $lang->delete, 'class' => 'batch-btn ajax-btn not-open-url', 'data-url' => helper::createLink('testcase', 'batchDelete', "productID=$productID"));
if($canBatchCaseTypeChange)
if($canBatchChangeType)
{
$typeItems = array();
foreach($lang->testcase->typeList as $key => $result)
foreach($lang->testcase->typeList as $key => $type)
{
$typeItems[] = array('text' => $result, 'className' => 'batch-btn ajax-btn not-open-url', 'data-url' => helper::createLink('testcase', 'batchCaseTypeChange', "result={$key}"));
$typeItems[] = array('text' => $type, 'className' => 'batch-btn ajax-btn not-open-url', 'data-url' => helper::createLink('testcase', 'batchChangeType', "type={$key}"));
}
$navActions[] = array('text' => $lang->testcase->type, 'class' => 'not-hide-menu', 'items' => $typeItems);
}
+8 -7
View File
@@ -86,7 +86,7 @@ js::set('langNormal', $lang->testcase->normal);
$datatableId = $this->moduleName . ucfirst($this->methodName);
$useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
?>
<form class='main-table table-case' data-nested='true' data-expand-nest-child='false' data-checkable='true' data-enable-empty-nested-row='true' data-replace-id='caseTableList' data-preserve-nested='true'
<form class='main-table table-case' data-nested='true' data-expand-nest-child='false' data-checkable='true' data-enable-empty-nested-row='true' data-replace-id='caseTableList' data-preserve-nested='true'
id='caseForm' method='post' <?php if(!$useDatatable) echo "data-ride='table'";?>>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right setting"></nav>
@@ -105,11 +105,11 @@ js::set('langNormal', $lang->testcase->normal);
$canBatchRun = common::hasPriv('testtask', 'batchRun');
$canBatchEdit = common::hasPriv('testcase', 'batchEdit');
$canBatchDelete = common::hasPriv('testcase', 'batchDelete');
$canBatchCaseTypeChange = common::hasPriv('testcase', 'batchCaseTypeChange');
$canBatchChangeType = common::hasPriv('testcase', 'batchChangeType');
$canBatchConfirmStoryChange = common::hasPriv('testcase', 'batchConfirmStoryChange');
$canBatchChangeModule = common::hasPriv('testcase', 'batchChangeModule');
$canImportToLib = common::hasPriv('testcase', 'importToLib');
$canBatchAction = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchCaseTypeChange or $canBatchConfirmStoryChange or $canBatchChangeModule or $canImportToLib);
$canBatchAction = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchChangeType or $canBatchConfirmStoryChange or $canBatchChangeModule or $canImportToLib);
?>
<?php if(!$useDatatable) echo '<div class="table-responsive">';?>
<table class='table has-sort-head table-fixed table-nested table has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='caseList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-checkbox-name='caseIDList[]'>
@@ -201,16 +201,17 @@ js::set('langNormal', $lang->testcase->normal);
echo "<li>" . html::a('#', $lang->delete, '', $misc) . "</li>";
}
if($canBatchCaseTypeChange)
if($canBatchChangeType)
{
echo "<li class='dropdown-submenu'>";
echo html::a('javascript:;', $lang->testcase->type, '', "id='typeChangeItem'");
echo "<ul class='dropdown-menu'>";
unset($lang->testcase->typeList['']);
foreach($lang->testcase->typeList as $key => $result)
unset($lang->testcase->typeList['unit']);
foreach($lang->testcase->typeList as $key => $type)
{
$actionLink = $this->createLink('testcase', 'batchCaseTypeChange', "result=$key");
echo '<li>' . html::a('#', $result, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#caseList')\"") . '</li>';
$actionLink = $this->createLink('testcase', 'batchChangeType', "type=$key");
echo '<li>' . html::a('#', $type, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#caseList')\"") . '</li>';
}
echo '</ul></li>';
}
+1 -1
View File
@@ -3079,7 +3079,7 @@ class upgradeModel extends model
$data = new stdclass();
$data->group = $groupID;
$data->module = 'testcase';
$newMethods = array('review', 'batchReview', 'batchCaseTypeChange', 'batchConfirmStoryChange');
$newMethods = array('review', 'batchReview', 'batchChangeType', 'batchConfirmStoryChange');
foreach($newMethods as $method)
{
$data->method = $method;
+1 -1
View File
@@ -9606,7 +9606,7 @@
["linkText=安全相关", "linkText"],
["css=.dropdown-submenu:nth-child(2) li:nth-child(5) > a", "css:finder"],
["xpath=//a[contains(text(),'安全相关')]", "xpath:link"],
["xpath=//a[@onclick=\"setFormAction('/testcase-batchCaseTypeChange-security.html', 'hiddenwin')\"]", "xpath:attributes"],
["xpath=//a[@onclick=\"setFormAction('/testcase-batchChangeType-security.html', 'hiddenwin')\"]", "xpath:attributes"],
["xpath=//ul[@id='moreActionMenu']/li[2]/ul/li[5]/a", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[7]", "xpath:href"],
["xpath=//li[2]/ul/li[5]/a", "xpath:position"],
+1 -1
View File
@@ -4109,7 +4109,7 @@
["linkText=功能测试", "linkText"],
["css=.dropdown-submenu:nth-child(2) li:nth-child(1) > a", "css:finder"],
["xpath=//a[contains(text(),'功能测试')]", "xpath:link"],
["xpath=//a[@onclick=\"setFormAction('/testcase-batchCaseTypeChange-feature.html', 'hiddenwin')\"]", "xpath:attributes"],
["xpath=//a[@onclick=\"setFormAction('/testcase-batchChangeType-feature.html', 'hiddenwin')\"]", "xpath:attributes"],
["xpath=//ul[@id='moreActionMenu']/li[2]/ul/li/a", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"],
["xpath=//li[2]/ul/li/a", "xpath:position"],