Merge branch 'master' into zentaopms_workflow

This commit is contained in:
wyd621
2019-07-24 09:14:23 +08:00
committed by GitHub
383 changed files with 12033 additions and 2094 deletions
+3 -3
View File
@@ -178,7 +178,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<td>
<div class='input-group'>
<?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?>
<div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists');?></div>
<?php echo $this->fetch('my', 'buildContactLists');?>
</div>
</td>
</tr>
@@ -212,7 +212,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->openedBy;?></th>
<td><?php echo $users[$bug->openedBy];?></td>
</tr>
@@ -266,7 +266,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr class='text-top'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->linkBug;?></th>
<td><?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
</tr>