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

* Fixed the error of createBug task.

Browse Source
This commit is contained in:
wangxuepeng
2023-11-06 17:49:57 +08:00
parent a51ee4691a
commit e7225cd88f
4 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/ui/story.html.php
+2 -2
View File
@@ -76,7 +76,7 @@ $linkStoryUrl = createLink('execution', 'linkStory', "project={$execution->i
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("project={$execution->id}");
$linkStoryUrl = createLink('tutorial', 'wizard', "module=project&method=linkStory&params=$wizardParams");
$linkStoryUrl = createLink('tutorial', 'wizard', "module=execution&method=linkStory&params=$wizardParams");
$canlinkPlanStory = false;
}
@@ -137,7 +137,7 @@ $product ? toolbar
set::placement('bottom-end'),
)
) : null,
$canLinkStory && !$canlinkPlanStory ? item(set($linkItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null,
$canLinkStory && !$canlinkPlanStory ? item(set($linkItem + array('class' => 'btn primary link-story-btn', 'icon' => 'plus'))) : null,
$canlinkPlanStory && !$canLinkStory ? item(set($linkPlanItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null,
) : null;
module/index/css/app.ui.css
+4
View File
@@ -0,0 +1,4 @@
.shl-tutorial { position: relative!important; z-index: 1010!important; -webkit-box-shadow: 0 0 0 0 #000!important; box-shadow: 0 0 0 0 #000!important; -webkit-transition: -webkit-box-shadow 1s!important; -o-transition: box-shadow 1s!important; transition: -webkit-box-shadow 1s!important; transition: box-shadow 1s!important; transition: box-shadow 1s,-webkit-box-shadow 1s!important }
.hl-tutorial.hl-in { -webkit-box-shadow: 0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 3000px rgba(0,0,0,.2)!important; box-shadow: 0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 3000px rgba(0,0,0,.2)!important }
.btn.tooltip-tutorial,.hl-tutorial.hl-in:hover { position: relative!important; z-index: 1010!important; -webkit-box-shadow: 0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 3000px rgba(0,0,0,.3)!important; box-shadow: 0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 3000px rgba(0,0,0,.3)!important }
module/story/tao.php
+4 -2
View File
@@ -1577,6 +1577,8 @@ class storyTao extends storyModel
{
global $lang;
$tutorialMode = commonModel::isTutorialMode();
$actSubmitreview = array();
$actReview = array();
$actRecall = array();
@@ -1679,7 +1681,7 @@ class storyTao extends storyModel
{
if($execution->type != 'project')
{
$createTaskLink = helper::createLink('task', 'create', "executionID={$execution->id}&storyID={$story->id}");
$createTaskLink = $tutorialMode ? helper::createLink('tutorial', 'wizard', "module=task&method=create&params=" . helper::safe64Encode("executionID={$execution->id}")) : helper::createLink('task', 'create', "executionID={$execution->id}&storyID={$story->id}");
$batchCreateTaskLink = helper::createLink('task', 'batchCreate', "executionID={$execution->id}&storyID={$story->id}");
$storyEstimateLink = helper::createLink('execution', 'storyEstimate', "executionID={$execution->id}&storyID={$story->id}");
@@ -1687,7 +1689,7 @@ class storyTao extends storyModel
$canBatchCreateTask = common::hasPriv('task', 'batchCreate') && $story->status == 'active';
$canStoryEstimate = common::hasPriv('execution', 'storyEstimate');
$actions[] = array('name' => 'createTask', 'url' => $canCreateTask ? $createTaskLink : null, 'disabled' => !$canCreateTask);
$actions[] = array('name' => 'createTask', 'url' => $canCreateTask ? $createTaskLink : null, 'disabled' => !$canCreateTask, 'className' => 'create-task-btn');
$actions[] = array('name' => 'batchCreateTask', 'url' => $canBatchCreateTask ? $batchCreateTaskLink : null, 'disabled' => !$canBatchCreateTask);
$actions[] = array('name' => 'storyEstimate', 'url' => $canStoryEstimate ? $storyEstimateLink : null, 'disabled' => !$canStoryEstimate);
}
module/tutorial/lang/zh-cn.php
+26 -5
View File
@@ -119,18 +119,39 @@ $lang->tutorial->tasks['createProjectExecution']['nav'] = array(
'menuModule' => '',
'menu' => '#table-tutorial-wizard > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="name"] > .dtable-cell-content >a',
'form' => '#mainContent',
'submit' => '#button[type=submit]',
'submit' => 'button[type=submit]',
'target' => '.create-execution-btn',
'targetPageName' => '添加' . $lang->executionCommon
);
$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>在系统创建一个新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 页面；</li><li data-target='form'>在{$lang->executionCommon}表单中填写要创建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
$lang->tutorial->tasks['linkStory'] = array('title' => "关联{$lang->SRCommon}");
$lang->tutorial->tasks['linkStory']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'linkStory', 'menuModule' => 'story', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],#navbar>.nav>li[data-id="story"],#executionTableList>tr:first>.c-name>a,.link-story-btn', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->SRCommon}");
$lang->tutorial->tasks['linkStory']['nav'] = array(
'app' => 'execution',
'module' => 'execution',
'method' => 'linkStory',
'menuModule' => 'story',
'menu' => '#heading > .toolbar > a[title="执行"], #table-execution-all > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="name"], .link-story-btn',
'target' => '',
'form' => '#table-tutorial-wizard',
'formType' => 'table',
'submit' => '#saveButton',
'targetPageName' => "关联{$lang->SRCommon}"
);
$lang->tutorial->tasks['linkStory']['desc'] = "<p>将{$lang->SRCommon}关联到执行：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 执行 <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 关联{$lang->SRCommon}</span> 页面；</li><li data-target='form'>在{$lang->SRCommon}列表中勾选要关联的{$lang->SRCommon}；</li><li data-target='submit'>保存关联的{$lang->SRCommon}信息。</li></ul>";
$lang->tutorial->tasks['createTask'] = array('title' => '分解任务');
$lang->tutorial->tasks['createTask']['nav'] = array('app' => 'execution', 'module' => 'task', 'method' => 'create', 'menuModule' => 'story', 'menu' => '', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任务');
$lang->tutorial->tasks['createTask']['nav'] = array(
'app' => 'execution',
'module' => 'task',
'method' => 'create',
'menuModule' => 'story',
'menu' => '',
'target' => '.create-task-btn',
'form' => '#mainContent',
'submit' => 'button[type=submit]',
'targetPageName' => '建任务'
);
$lang->tutorial->tasks['createTask']['desc'] = "<p>将执行{$lang->SRCommon}分解为任务：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 执行 <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 分解任务</span> 页面；</li><li data-target='form'>在表单中填写任务信息；</li><li data-target='submit'>保存任务信息。</li></ul>";
$lang->tutorial->tasks['createBug'] = array('title' => '提Bug');
@@ -142,8 +163,8 @@ $lang->tutorial->tasks['createBug']['nav'] = array(
'menu' => 'bug',
'target' => '.create-bug-btn',
'vars' => 'productID=0',
'form' => '#dataform',
'submit' => '#submit',
'form' => '#mainContent',
'submit' => 'button[type=submit]',
'targetPageName' => '提Bug'
);
$lang->tutorial->tasks['createBug']['desc'] = "<p>在系统中提交一个Bug：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 测试 <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> 提Bug</span>；</li><li data-target='form'>在表单中填写Bug信息；</li><li data-target='submit'>保存Bug信息。</li></ul>";