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

Merge branch 'sprint/294_liumengyi_fixbug'

Browse Source
This commit is contained in:
Yagami
2023-02-28 15:17:01 +08:00
parent 54c3641625 cde3ff49f3
commit 626b5f3abf
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/js/execution.js
-1
View File
@@ -220,7 +220,6 @@ function showEditCheckbox(show)
}
else
{
var marginLeft = $tr.find('td:first').find('.checkbox-primary').css('margin-left');
$tr.find('td:first').find('[name^="executionIDList"]').parent().remove();
}
});
module/story/control.php
+3 -1
View File
@@ -511,9 +511,11 @@ class story extends control
$execution = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
if($execution->type == 'project')
{
$model = $execution->model == 'waterfallplus' ? 'waterfall' : $execution->model;
$model = $execution->model == 'agileplus' ? 'scrum' : $model;
$this->project->setMenu($executionID);
$this->lang->navGroup->story = 'project';
$this->lang->product->menu = $this->lang->{$execution->model}->menu;
$this->lang->product->menu = $this->lang->{$model}->menu;
}
else
{
module/task/view/batchcreate.html.php
+1 -1
View File
@@ -75,7 +75,7 @@ $colspan = count($visibleFields) + 3;
<th class='c-module'><?php echo $lang->kanbancard->region;?></th>
<th class='c-module'><?php echo $lang->kanbancard->lane;?></th>
<?php endif;?>
<th class='c-type required'><?php echo $lang->typeAB;?></span></th>
<th class='c-type required'><?php echo $lang->task->type;?></span></th>
<th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?> assignedToBox'><?php echo $lang->task->assignedTo;?></th>
<th class='c-estimate<?php echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', '', ' required');?> estimateBox'><?php echo $lang->task->estimateAB;?></th>
<th class='c-date<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?> estStartedBox'><?php echo $lang->task->estStarted;?></th>
module/task/view/batchedit.html.php
+1 -1
View File
@@ -59,7 +59,7 @@ js::set('requiredFields', $config->task->edit->requiredFields);
<th class='required <?php if(count($visibleFields) > 10) echo 'c-name';?>'><?php echo $lang->task->name?></th>
<th class='c-module<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->task->module?></th>
<th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
<th class='c-type required'><?php echo $lang->typeAB; ?></th>
<th class='c-type required'><?php echo $lang->task->type; ?></th>
<th class='c-status<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->task->status;?></th>
<th class='c-date<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted?></th>
<th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->task->deadline?></th>