Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #43103.

Browse Source
This commit is contained in:
liumengyi
2024-01-09 13:47:21 +08:00
parent a737a67330
commit 7c68a37a3f
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+2
View File
@@ -2313,6 +2313,7 @@ class commonModel extends model
$moduleName = $app->moduleName;
$methodName = $app->methodName;
$actionsMenu = array();
$isInModal = helper::isAjaxRequest('modal');
$this->loadModel($moduleName);
foreach($config->{$moduleName}->actions->{$methodName} as $menu => $actionList)
@@ -2321,6 +2322,7 @@ class commonModel extends model
foreach($actionList as $action)
{
$actionData = $config->{$moduleName}->actionList[$action];
if($isInModal && !empty($actionData['notInModal'])) continue;
if(!empty($actionData['url']) && is_array($actionData['url']))
{
module/testcase/config/action.php
+14 -10
View File
@@ -24,11 +24,12 @@ $config->testcase->actionList['runResult']['url'] = array('module' => 't
$config->testcase->actionList['runResult']['data-toggle'] = 'modal';
$config->testcase->actionList['runResult']['data-size'] = 'lg';
$config->testcase->actionList['edit']['icon'] = 'edit';
$config->testcase->actionList['edit']['text'] = $lang->testcase->edit;
$config->testcase->actionList['edit']['hint'] = $lang->testcase->edit;
$config->testcase->actionList['edit']['url'] = array('module' => 'testcase', 'method' => 'edit', 'params' => 'caseID={caseID}&comment=false&executionID=%executionID%');
$config->testcase->actionList['edit']['data-app'] = $app->tab;
$config->testcase->actionList['edit']['icon'] = 'edit';
$config->testcase->actionList['edit']['text'] = $lang->testcase->edit;
$config->testcase->actionList['edit']['hint'] = $lang->testcase->edit;
$config->testcase->actionList['edit']['url'] = array('module' => 'testcase', 'method' => 'edit', 'params' => 'caseID={caseID}&comment=false&executionID=%executionID%');
$config->testcase->actionList['edit']['data-app'] = $app->tab;
$config->testcase->actionList['edit']['notInModal'] = true;
$config->testcase->actionList['review']['icon'] = 'glasses';
$config->testcase->actionList['review']['text'] = $lang->testcase->review;
@@ -41,6 +42,7 @@ $config->testcase->actionList['importToLib']['text'] = $lang->testcase->i
$config->testcase->actionList['importToLib']['hint'] = $lang->testcase->importToLib;
$config->testcase->actionList['importToLib']['url'] = array('module' => 'testcase', 'method' => 'importToLib', 'params' => 'caseID={caseID}');
$config->testcase->actionList['importToLib']['data-toggle'] = 'modal';
$config->testcase->actionList['importToLib']['notInModal'] = true;
$config->testcase->actionList['createBug']['icon'] = 'bug';
$config->testcase->actionList['createBug']['text'] = $lang->testcase->createBug;
@@ -49,11 +51,12 @@ $config->testcase->actionList['createBug']['url'] = array('module' => 't
$config->testcase->actionList['createBug']['data-toggle'] = 'modal';
$config->testcase->actionList['createBug']['data-size'] = 'lg';
$config->testcase->actionList['create']['icon'] = 'copy';
$config->testcase->actionList['create']['text'] = $lang->testcase->copy;
$config->testcase->actionList['create']['hint'] = $lang->testcase->copy;
$config->testcase->actionList['create']['url'] = array('module' => 'testcase', 'method' => 'create', 'params' => 'productID={product}&branch={branch}&moduleID={module}&from=testcase&param={caseID}');
$config->testcase->actionList['create']['data-app'] = $app->tab;
$config->testcase->actionList['create']['icon'] = 'copy';
$config->testcase->actionList['create']['text'] = $lang->testcase->copy;
$config->testcase->actionList['create']['hint'] = $lang->testcase->copy;
$config->testcase->actionList['create']['url'] = array('module' => 'testcase', 'method' => 'create', 'params' => 'productID={product}&branch={branch}&moduleID={module}&from=testcase&param={caseID}');
$config->testcase->actionList['create']['data-app'] = $app->tab;
$config->testcase->actionList['create']['notInModal'] = true;
$config->testcase->actionList['unlinkCase']['icon'] = 'unlink';
$config->testcase->actionList['unlinkCase']['text'] = $lang->testtask->unlinkCase;
@@ -84,6 +87,7 @@ $config->testcase->actionList['delete']['hint'] = $lang->testcase->delet
$config->testcase->actionList['delete']['url'] = array('module' => 'testcase', 'method' => 'delete', 'params' => 'caseID={id}');
$config->testcase->actionList['delete']['class'] = 'ajax-submit';
$config->testcase->actionList['delete']['data-confirm'] = $lang->testcase->confirmDelete;
$config->testcase->actionList['delete']['notInModal'] = true;
$config->scene = new stdclass();
$config->scene->menu = array('editScene', 'deleteScene');