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

*

Browse Source
This commit is contained in:
孙华伟
2022-02-28 15:46:06 +08:00
parent 0ea4f15d4b
commit 271e52a98c
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
-1
View File
@@ -2084,7 +2084,6 @@ class execution extends control
$this->view->branchID = $branchID;
$this->view->projectID = $this->loadModel('task')->getProjectID($execution->id);
$this->view->allProducts = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->view->projectID, 'noclosed');
a($this->view->allProducts);
$this->view->allPlans = $allPlans;
$this->view->kanbanData = $kanbanData;
$this->view->executionActions = $executionActions;
module/execution/view/kanban.html.php
+11 -3
View File
@@ -163,7 +163,15 @@ js::set('hasTaskButton', $hasTaskButton);
<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
<ul class='dropdown-menu pull-right'>
<?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
<?php if($canBatchCreateStory) echo '<li>' . html::a('#batchCreateStroy', $lang->execution->batchCreateStroy, '', 'data-toggle="modal"') . '</li>';?>
<?php
if($canBatchCreateStory)
{
if(count($allProducts)>1)
echo '<li>' . html::a('#batchCreateStroy', $lang->execution->batchCreateStroy, '', 'data-toggle="modal"') . '</li>';
else
echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='iframe' data-width='90%'") . '</li>';
}
?>
<?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
<?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
<?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>
@@ -236,8 +244,8 @@ js::set('hasTaskButton', $hasTaskButton);
</div>
<div class="modal-body">
<div class='input-group'>
<?php echo html::select('plan', $allPlans, '', "class='form-control chosen' id='plan'"); a($productID);?>
<span class='input-group-btn'><?php echo html::commonButton($lang->execution->batchCreateStroy, "id='toStoryButton'", 'btn btn-primary');?></span>
<?php echo html::select('plan', $allProducts, '', "class='form-control chosen' id='plan'");?>
<span class='input-group-btn'><?php echo html::commonButton(html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='btn-primary iframe' data-width='90%'"), "id='toStoryButton'", 'btn btn-primary');?></span>
</div>
</div>
</div>