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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-07-02 14:54:10 +08:00
parent bf99726d14 c9f0751c8a
commit a582b842e1
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/js/view.js
+1 -1
View File
@@ -1,4 +1,4 @@
function showLink(planID, type, param)
function showLink(planID, type, orderBy, param)
{
var method = type == 'story' ? 'linkStory' : 'linkBug';
$.get(createLink('productplan', method, 'planID=' + planID + (typeof(param) == 'undefined' ? '' : param) + (typeof(orderBy) == 'undefined' ? '' : "&orderBy=" + orderBy)), function(data)
module/project/view/all.html.php
+6 -10
View File
@@ -69,25 +69,21 @@
<?php endif;?>
<?php printf('%03d', $project->id);?>
</td>
<td class='text-left' title='<?php echo $project->name?>'><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);?></td>
<td class='text-left' title='<?php echo $project->name?>'>
<?php
if(isset($project->delay)) echo "<span class='label label-danger label-badge'>{$lang->project->delayed}</span> ";
echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);
?>
</td>
<td class='text-left'><?php echo $project->code;?></td>
<td><?php echo $users[$project->PM];?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='c-status' title='<?php echo $lang->project->delayed;?>'>
<span class="status-delayed">
<span class="label label-dot"></span>
<span class='status-text'><?php echo $lang->project->delayed;?></span>
</span>
</td>
<?php else:?>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="status-<?php echo $project->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->project->statusList, $project->status);?></span>
</span>
</td>
<?php endif;?>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
<td><?php echo $project->hours->totalLeft;?></td>