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

Merge branch 'bugfix/33127_lmy' into 'master'

Browse Source 
* Fix bug #33139, #33127

See merge request easycorp/zentaopms!7255
This commit is contained in:
王怡栋
2023-03-21 05:27:39 +00:00
parent f51c04d4fc 1037f1aa82
commit cf737b035e
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/edit.html.php
+10 -12
View File
@@ -87,25 +87,23 @@
</div>
</td>
</tr>
<?php if($execution->type != 'kanban' or $project->model == 'waterfall' or $project->model == 'waterfallplus'):?>
<?php if($project->model == 'waterfall' or $project->model == 'waterfallplus'):?>
<tr>
<th><?php echo $lang->execution->type;?></th>
<th><?php echo $lang->stage->type;?></th>
<td>
<?php
if($project->model == 'waterfall' or $project->model == 'waterfallplus')
{
echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='form-control chosen'") : zget($lang->stage->typeList, $execution->attribute);
}
elseif($execution->type != 'kanban')
{
echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");
}
?>
<?php echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='form-control chosen'") : zget($lang->stage->typeList, $execution->attribute); ?>
</td>
<td>
<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
</td>
</tr>
<?php elseif($execution->type != 'kanban'):?>
<tr>
<th><?php echo $lang->execution->type;?></th>
<td>
<?php echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'"); ?>
</td>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->execution->teamname;?></th>
module/execution/view/story.html.php
+1 -1
View File
@@ -242,7 +242,7 @@
$canBatchClose = common::hasPriv('story', 'batchClose');
$canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
$canBatchUnlink = common::hasPriv('execution', 'batchUnlinkStory');
$canBatchToTask = common::hasPriv('story', 'batchToTask', $checkObject);
$canBatchToTask = (common::hasPriv('story', 'batchToTask', $checkObject) and $storyType != 'requirement');
$canBatchAssignTo = common::hasPriv($storyType, 'batchAssignTo');
$canBatchAction = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask or $canBatchAssignTo));
module/story/control.php
+2
View File
@@ -960,6 +960,8 @@ class story extends control
$branch = $product->type == 'branch' ? ($story->branch > 0 ? $story->branch : '0') : 'all';
$productStories = $this->story->getProductStoryPairs($story->product, $branch, 0, 'all', 'id_desc', 0, '', $story->type);
if($story->type == 'requirement') $this->lang->story->notice->reviewerNotEmpty = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->notice->reviewerNotEmpty);
$this->view->title = $this->lang->story->edit . "STORY" . $this->lang->colon . $this->view->story->title;
$this->view->position[] = $this->lang->story->edit;
$this->view->story = $story;