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

* Fix bug #32559.

Browse Source
This commit is contained in:
liumengyi
2023-03-01 07:44:17 +00:00
parent 1290b01c85
commit fcf2ca081f
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/execution/control.php
View File

@@ -2093,7 +2093,7 @@ class execution extends control
$project = $this->project->getById($execution->project);
if(!$project->hasProduct) $this->lang->execution->PO = $this->lang->common->story . $this->lang->execution->owner;
if($execution->type == 'stage')
if($project->model == 'waterfall' or $project->model == 'waterfallplus')
{
$parentStage = $this->project->getByID($execution->parent, 'stage');
@@ -2182,6 +2182,8 @@ class execution extends control
if(!$this->post->executionIDList) return print(js::locate($this->session->executionList, 'parent'));
$executionIDList = $this->post->executionIDList;
$executions = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id');
$projects = $this->dao->select('id,project')->from(TABLE_PROJECT)->where('id')->in($executionIDList)->fetchPairs();
$projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($projects)->fetchAll('id');
$appendPoUsers = $appendPmUsers = $appendQdUsers = $appendRdUsers = array();
foreach($executions as $execution)
@@ -2214,6 +2216,7 @@ class execution extends control
$this->view->position[] = $this->lang->execution->batchEdit;
$this->view->executions = $executions;
$this->view->allProjects = $allProjects;
$this->view->projects = $projects;
$this->view->pmUsers = $pmUsers;
$this->view->poUsers = $poUsers;
$this->view->qdUsers = $qdUsers;

2
module/execution/view/batchedit.html.php
View File

@@ -105,7 +105,7 @@
<td class='text-left<?php echo zget($visibleFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$executionID]", $qdUsers, $executions[$executionID]->QD, "class='form-control picker-select'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'RD', ' hidden')?>' style='overflow:visible'><?php echo html::select("RDs[$executionID]", $rdUsers, $executions[$executionID]->RD, "class='form-control picker-select'");?></td>
<td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>
<?php if($executions[$executionID]->type == 'stage'):?>
<?php if(isset($projects[$execution->project]) and ($projects[$execution->project]->model == 'waterfall' or $projects[$execution->project]->model == 'waterfallplus')):?>
<?php echo html::select("attributes[$executionID]", $lang->stage->typeList, $executions[$executionID]->attribute, 'class=form-control');?>
<?php else:?>
<?php echo html::select("lifetimes[$executionID]", $lang->execution->lifeTimeList, $executions[$executionID]->lifetime, 'class=form-control');?>

12
module/execution/view/edit.html.php
View File

@@ -87,19 +87,19 @@
</div>
</td>
</tr>
<?php if($execution->type != 'kanban'):?>
<?php if($execution->type != 'kanban' or $project->model == 'waterfall' or $project->model == 'waterfallplus'):?>
<tr>
<th><?php echo $lang->execution->type;?></th>
<td>
<?php
if($execution->type != 'stage')
{
echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");
}
else
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()'");
}
?>
</td>
<td>

2
module/execution/view/view.html.php
View File

@@ -277,7 +277,7 @@
<?php if($execution->deleted):?>
<span class='label label-danger label-outline'><?php echo $lang->execution->deleted;?></span>
<?php endif;?>
<?php if(!empty($execution->lifetime) and $execution->type != 'kanban'):?>
<?php if(!empty($execution->lifetime) and $execution->type != 'kanban' and $project->model != 'waterfall' and $project->model != 'waterfallplus'):?>
<span class="label label-primary label-outline"><?php echo zget($lang->execution->lifeTimeList, $execution->lifetime);?></span>
<?php endif;?>
<?php if(isset($execution->delay)):?>