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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2021-01-20 16:44:56 +08:00
parent 9e6ff0a9b2 fd672669f7
commit ee7c9937ac
23 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/view/linkstory.html.php
+2 -2
View File
@@ -25,7 +25,7 @@
<?php endif;?>
</div>
<div class='btn-toolbar pull-right'>
<?php common::printBack($this->server->http_referer, 'btn btn-link');?>
<?php common::printBack($this->createLink($this->app->rawModule, 'story'), 'btn btn-link');?>
</div>
</div>
<div id="mainContent">
@@ -81,7 +81,7 @@
<td><?php if(isset($branchGroups[$story->product][$story->branch])) echo $branchGroups[$story->product][$story->branch];?></td>
<?php endif;?>
<td><?php echo zget($users, $story->openedBy);?></td>
<td class='text-center'><?php echo $story->estimate;?></td>
<td class='text-center'><?php echo $story->estimate . $config->hourUnit;?></td>
</tr>
<?php $storyCount++;?>
<?php endforeach;?>
module/project/view/storykanban.html.php
+1 -1
View File
@@ -80,7 +80,7 @@ $account = $this->app->user->account;
<?php if($canBeChanged and common::hasPriv('project', 'unlinkStory')):?>
<div class='pull-right'><?php echo html::a($this->createLink('project', 'unlinkStory', "projectID=$projectID&story=$story->id"), "<i class='icon icon-unlink icon-sm'></i>", 'hiddenwin', "title='{$lang->project->unlinkStory}'");?></div>
<?php endif;?>
<div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . 'h ';?></div>
<div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . "$config->hourUnit ";?></div>
</div>
</div>
<?php endforeach?>