* Code for bug #13766.

This commit is contained in:
Yagami
2021-07-22 14:57:15 +08:00
parent 5a25b835ff
commit 048ec8020b
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -393,7 +393,7 @@ class todo extends control
$this->view->actions = $this->loadModel('action')->getList('todo', $todoID);
$this->view->from = $from;
$this->view->projects = $projects;
$this->view->executions = $this->loadModel('execution')->getPairs($this->session->project);
$this->view->executions = $this->loadModel('execution')->getPairs();
$this->view->products = $todo->type == 'opportunity' ? $this->loadModel('product')->getPairsByProjectModel('waterfall') : $this->loadModel('product')->getPairs();
$this->view->projectProducts = $this->loadModel('product')->getProductPairsByProject($this->session->project);
+1 -1
View File
@@ -35,7 +35,7 @@ $lang->todo->cycle = "周期";
$lang->todo->cycleConfig = "周期设置";
$lang->todo->project = "所属项目";
$lang->todo->product = "所属产品";
$lang->todo->execution = "所属执行";
$lang->todo->execution = "所属{$lang->execution->common}";
$lang->todo->reasonList['story'] = "{$lang->SRCommon}";
$lang->todo->reasonList['task'] = "转任务";
+3 -1
View File
@@ -202,7 +202,7 @@
<h4 class="modal-title"><?php echo $lang->execution->selectExecution;?></h4>
</div>
<div class="modal-body">
<?php if(empty($projects)):?>
<?php if((empty($projects) and $config->systemMode == 'new') || ($config->systemMode == 'classic') and empty($executions)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->project->empty;?></span>
@@ -211,10 +211,12 @@
</div>
<?php else:?>
<table align='center' class='table table-form'>
<?php if($config->systemMode == 'new'):?>
<tr>
<th><?php echo $lang->todo->project;?></th>
<td><?php echo html::select('project', $projects, '', "class='form-control chosen' onchange=getExecutionByProject(this.value);");?></td>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->todo->execution;?></th>
<td id='executionIdBox'><?php echo html::select('execution', $executions, '', "class='form-control chosen'");?></td>