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

Merge branch 'cyy_23586' into 'master'

Browse Source 
* Fix bug #23586.

See merge request easycorp/zentaopms!3879
This commit is contained in:
李玉春
2022-06-15 00:45:00 +00:00
parent d40cdbef85 c1876a6dbc
commit 481b40a16b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/importtask.css
+1
View File
@@ -1,2 +1,3 @@
#fromproject_chosen .chosen-single {width: 220px;}
.c-name {width: 200px;}
#importTaskForm {min-height: 350px;}
module/execution/view/importtask.html.php
+5 -1
View File
@@ -35,7 +35,11 @@
</th>
<th class='c-name'><?php echo $lang->execution->name ?></th>
<th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
<?php if(isonlybody()):?>
<th class='w-p25'><?php echo $lang->task->name;?></th>
<?php else:?>
<th class='w-p30'><?php echo $lang->task->name;?></th>
<?php endif;?>
<th class='c-user'><?php echo $lang->task->assignedTo;?></th>
<th class='c-hour'><?php echo $lang->task->leftAB;?></th>
<th class='c-date'><?php echo $lang->task->deadlineAB;?></th>
@@ -56,7 +60,7 @@
</td>
<td title="<?php echo $executions[$task->execution];?>"><?php echo $executions[$task->execution];?></td>
<td><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
<td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name, '', "class='preview'", true, isonlybody())) echo $task->name;?></td>
<td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>
<td title="<?php echo $task->left . ' ' . $lang->execution->workHour;?>"><?php echo $task->left . ' ' . $lang->execution->workHourUnit;?></td>
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>