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

* fix bug #20703

Browse Source
This commit is contained in:
Zongjun Lan
2022-03-14 15:43:15 +08:00
parent 94068dcb1f
commit 3d936d7dc8
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/execution/ext/lang/zh-cn/lite.php
+1
View File
@@ -7,6 +7,7 @@ $lang->execution->createKanban = '创建看板';
$lang->execution->noExecution = "暂时没有看板。";
$lang->execution->importTask = '转入任务';
$lang->execution->batchCreateTask = '批量创建任务';
$lang->execution->linkStory = "创建{$lang->SRCommon}";
$lang->execution->kanbanGroup['default'] = '默认方式';
$lang->execution->kanbanGroup['story'] = '目标';
extension/lite/task/ext/view/create.html.php
+4 -1
View File
@@ -15,6 +15,9 @@
<?php include $this->app->getModuleRoot() . '/common/view/sortable.html.php';?>
<?php js::set('toTaskList', !empty($task->id));?>
<?php js::set('blockID', $blockID);?>
<?php js::set('vision', $this->config->vision);?>
<?php js::set('projectID', $projectID);?>
<?php js::set('productID', $productID);?>
<?php if(!empty($storyID)):?>
<style> .title-group.required > .required:after {right: 110px;}</style>
<?php endif;?>
@@ -95,7 +98,7 @@
<tr>
<th><?php echo $lang->task->story;?></th>
<td colspan='3'>
<span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=story"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
<?php echo html::select('story', array($task->story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
<span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
module/task/control.php
+2 -1
View File
@@ -261,7 +261,8 @@ class task extends control
$this->view->members = $members;
$this->view->blockID = $blockID;
$this->view->moduleOptionMenu = $moduleOptionMenu;
$this->view->projectID = $projectID;
$this->view->productID = $this->loadModel('product')->getProductIDByProject($projectID);;
$this->display();
}
module/task/js/create.js
+7
View File
@@ -275,6 +275,13 @@ function setStories(moduleID, executionID)
{
$('#storyBox').removeClass('hidden');
$('#story').parent().addClass('hidden');
/* change link when lite */
if(vision == 'lite')
{
config.onlybody = 'no';
$('#storyBox > a:first').attr('href', createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=' + moduleID + '&storyID=0&projectID=' + projectID + '&bugID=0&planID=0&todoID=0&extra=&type=story') + '#_single');
}
}
});
}